From f809bbff20e5ee6495bee25c5937844039762c79 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Mon, 4 Apr 2022 14:00:40 +0200 Subject: [PATCH 1/3] Sort the versions in the output XML according to their version --- scripts/create-update-xml.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/create-update-xml.sh b/scripts/create-update-xml.sh index 94ff32f..e7bde55 100755 --- a/scripts/create-update-xml.sh +++ b/scripts/create-update-xml.sh @@ -4,7 +4,7 @@ cat res/prefix.template > slt-update.xml -find releases -name slt-\* | while read f +find releases -name slt-\* | sort -V | while read f do VSTR=`echo "$f" | sed -E 's@releases/slt-@@; s@^([0-9]+\.[0-9]+\.[0-9]+).*$@\1@'` From 2ba77e7a9ead2d1428e11c2c4a05eba3f978dc80 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Mon, 4 Apr 2022 14:01:18 +0200 Subject: [PATCH 2/3] Automatically create new template details XML file --- Makefile | 6 ++- res/templateDetails.tmpl.xml | 95 +++++++++++++++++++++++++++++++++++ scripts/create-details-xml.sh | 10 ++++ 3 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 res/templateDetails.tmpl.xml create mode 100755 scripts/create-details-xml.sh diff --git a/Makefile b/Makefile index 2a57c43..e6cf574 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ npm: cd slt; npm run sass .PHONY: slt.tar.gz -slt.tar.gz: npm +slt.tar.gz: npm slt/templateDetails.xml # cd slt ; tar czf ../$@ * tar czf $@ -C slt \ css/dynamic-styles.css.php css/index.html css/style.css css/.htaccess \ @@ -34,6 +34,10 @@ slt.tar.gz: npm template_thumbnail.png \ templateDetails.xml +.PHONY: slt/templateDetails.xml +slt/templateDetails.xml: + ./scripts/create-details-xml.sh + .PHONY: release release: slt.tar.gz ./scripts/create-release.sh diff --git a/res/templateDetails.tmpl.xml b/res/templateDetails.tmpl.xml new file mode 100644 index 0000000..512caa6 --- /dev/null +++ b/res/templateDetails.tmpl.xml @@ -0,0 +1,95 @@ + + + + + + SLT + Template des Saarländischen Landesverbands für Tanzsport e.V. + ${DATE} + ${VERSION} + Christian Wolf + homepage@slt.wolf-stuttgart.net + https://git.christian-wolf.click/slt/template + + + + css + images + language + js + html + index.php + index.html + favicon.ico + templateDetails.xml + template_preview.png + template_thumbnail.png + + + + + topmenu + slideshow + mobile_menu + left_menu + footline + impressum + footer + current_page_menu + + + + + + +
+ + + + +
+
+ + + + + + +
+
+ + + + + + + + + + + + + + + + + + + +
+
+
+ + + http://slt.wolf-stuttgart.net/update/template/slt-update.xml + +
diff --git a/scripts/create-details-xml.sh b/scripts/create-details-xml.sh new file mode 100755 index 0000000..58ff143 --- /dev/null +++ b/scripts/create-details-xml.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +MAJOR=`cat serial/major` +MINOR=`cat serial/minor` +RELEASE=`cat serial/release` + +export DATE=`date '+%Y-%m-%d'` +export VERSION="$MAJOR.$MINOR.$RELEASE" + +cat res/templateDetails.tmpl.xml | envsubst > slt/templateDetails.xml From 114ffbd7fa547ef450af735a185eb1bbc3d64854 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Mon, 4 Apr 2022 14:02:14 +0200 Subject: [PATCH 3/3] Remove template from git source code --- slt/.gitignore | 1 + slt/templateDetails.xml | 119 ---------------------------------------- 2 files changed, 1 insertion(+), 119 deletions(-) delete mode 100644 slt/templateDetails.xml diff --git a/slt/.gitignore b/slt/.gitignore index 6ff7d6b..0c0c233 100644 --- a/slt/.gitignore +++ b/slt/.gitignore @@ -1,2 +1,3 @@ /node_modules/ /.stylelintcache +/templateDetails.xml diff --git a/slt/templateDetails.xml b/slt/templateDetails.xml deleted file mode 100644 index f8c13c8..0000000 --- a/slt/templateDetails.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - SLT - SLT - - 25.03.2019 - - Christian Wolf - - homepage@slt.wolf-stuttgart.net - - - - 0.0.8 - - - - - - - css - images - language - js - html - - index.php - - index.html - - - - templateDetails.xml - - template_preview.png - template_thumbnail.png - - - - - - - - - topmenu - slideshow - mobile_menu - left_menu - footline - impressum - footer - current_page_menu - - - - - - - - -
- - - - -
-
- - - - - - -
-
- - - - - - - - - - - - - - - - - - - -
-
-
- - - http://slt.wolf-stuttgart.net/update/template/slt-update.xml - -