From 2e6bf55fa5823071406666b27bfc787293e5bcce Mon Sep 17 00:00:00 2001 From: "Michael J.M. Wagner" Date: Tue, 17 Oct 2023 20:41:18 +0200 Subject: [PATCH] posaune --- {TestXfhem => Test/xFhem}/.dummy | 0 {TestXfhem => Test/xFhem}/FitnessePages/.dummy | 0 {TestXfhem => Test/xFhem}/FitnessePages/AaaPrepare/.dummy | 0 .../xFhem}/FitnessePages/AaaPrepare/content.txt | 0 .../xFhem}/FitnessePages/AaaPrepare/properties.xml | 0 {TestXfhem => Test/xFhem}/FitnessePages/TestWatchdog/.dummy | 0 .../xFhem}/FitnessePages/TestWatchdog/content.txt | 0 .../xFhem}/FitnessePages/TestWatchdog/properties.xml | 0 {TestXfhem => Test/xFhem}/FitnessePages/content.txt | 0 {TestXfhem => Test/xFhem}/FitnessePages/properties.xml | 0 {TestXfhem => Test/xFhem}/bin/.dummy | 0 {TestXfhem => Test/xFhem}/bin/install-sysal-stub | 0 {TestXfhem => Test/xFhem}/bin/sysal-stub.pl | 0 debian/timetracker.cp | 2 +- debian/timetracker.prepare | 5 +++-- 15 files changed, 4 insertions(+), 3 deletions(-) rename {TestXfhem => Test/xFhem}/.dummy (100%) rename {TestXfhem => Test/xFhem}/FitnessePages/.dummy (100%) rename {TestXfhem => Test/xFhem}/FitnessePages/AaaPrepare/.dummy (100%) rename {TestXfhem => Test/xFhem}/FitnessePages/AaaPrepare/content.txt (100%) rename {TestXfhem => Test/xFhem}/FitnessePages/AaaPrepare/properties.xml (100%) rename {TestXfhem => Test/xFhem}/FitnessePages/TestWatchdog/.dummy (100%) rename {TestXfhem => Test/xFhem}/FitnessePages/TestWatchdog/content.txt (100%) rename {TestXfhem => Test/xFhem}/FitnessePages/TestWatchdog/properties.xml (100%) rename {TestXfhem => Test/xFhem}/FitnessePages/content.txt (100%) rename {TestXfhem => Test/xFhem}/FitnessePages/properties.xml (100%) rename {TestXfhem => Test/xFhem}/bin/.dummy (100%) rename {TestXfhem => Test/xFhem}/bin/install-sysal-stub (100%) rename {TestXfhem => Test/xFhem}/bin/sysal-stub.pl (100%) diff --git a/TestXfhem/.dummy b/Test/xFhem/.dummy similarity index 100% rename from TestXfhem/.dummy rename to Test/xFhem/.dummy diff --git a/TestXfhem/FitnessePages/.dummy b/Test/xFhem/FitnessePages/.dummy similarity index 100% rename from TestXfhem/FitnessePages/.dummy rename to Test/xFhem/FitnessePages/.dummy diff --git a/TestXfhem/FitnessePages/AaaPrepare/.dummy b/Test/xFhem/FitnessePages/AaaPrepare/.dummy similarity index 100% rename from TestXfhem/FitnessePages/AaaPrepare/.dummy rename to Test/xFhem/FitnessePages/AaaPrepare/.dummy diff --git a/TestXfhem/FitnessePages/AaaPrepare/content.txt b/Test/xFhem/FitnessePages/AaaPrepare/content.txt similarity index 100% rename from TestXfhem/FitnessePages/AaaPrepare/content.txt rename to Test/xFhem/FitnessePages/AaaPrepare/content.txt diff --git a/TestXfhem/FitnessePages/AaaPrepare/properties.xml b/Test/xFhem/FitnessePages/AaaPrepare/properties.xml similarity index 100% rename from TestXfhem/FitnessePages/AaaPrepare/properties.xml rename to Test/xFhem/FitnessePages/AaaPrepare/properties.xml diff --git a/TestXfhem/FitnessePages/TestWatchdog/.dummy b/Test/xFhem/FitnessePages/TestWatchdog/.dummy similarity index 100% rename from TestXfhem/FitnessePages/TestWatchdog/.dummy rename to Test/xFhem/FitnessePages/TestWatchdog/.dummy diff --git a/TestXfhem/FitnessePages/TestWatchdog/content.txt b/Test/xFhem/FitnessePages/TestWatchdog/content.txt similarity index 100% rename from TestXfhem/FitnessePages/TestWatchdog/content.txt rename to Test/xFhem/FitnessePages/TestWatchdog/content.txt diff --git a/TestXfhem/FitnessePages/TestWatchdog/properties.xml b/Test/xFhem/FitnessePages/TestWatchdog/properties.xml similarity index 100% rename from TestXfhem/FitnessePages/TestWatchdog/properties.xml rename to Test/xFhem/FitnessePages/TestWatchdog/properties.xml diff --git a/TestXfhem/FitnessePages/content.txt b/Test/xFhem/FitnessePages/content.txt similarity index 100% rename from TestXfhem/FitnessePages/content.txt rename to Test/xFhem/FitnessePages/content.txt diff --git a/TestXfhem/FitnessePages/properties.xml b/Test/xFhem/FitnessePages/properties.xml similarity index 100% rename from TestXfhem/FitnessePages/properties.xml rename to Test/xFhem/FitnessePages/properties.xml diff --git a/TestXfhem/bin/.dummy b/Test/xFhem/bin/.dummy similarity index 100% rename from TestXfhem/bin/.dummy rename to Test/xFhem/bin/.dummy diff --git a/TestXfhem/bin/install-sysal-stub b/Test/xFhem/bin/install-sysal-stub similarity index 100% rename from TestXfhem/bin/install-sysal-stub rename to Test/xFhem/bin/install-sysal-stub diff --git a/TestXfhem/bin/sysal-stub.pl b/Test/xFhem/bin/sysal-stub.pl similarity index 100% rename from TestXfhem/bin/sysal-stub.pl rename to Test/xFhem/bin/sysal-stub.pl diff --git a/debian/timetracker.cp b/debian/timetracker.cp index 760300c..b577aa2 100755 --- a/debian/timetracker.cp +++ b/debian/timetracker.cp @@ -5,7 +5,7 @@ mkdir -p $1/usr/share/php/timetracker rsync -a --delete --exclude='.git' Downloads/timetracker/ $1/usr/share/php/timetracker/ mkdir -p $1/etc/apache2/sites-available -cp debian/timetracker.conf $1/etc/apache2/sites-available/ +cp timetracker/timetracker.conf $1/etc/apache2/sites-available/ mkdir -p $1/usr/share/doc/timetracker cp Downloads/timetracker/license.txt $1/usr/share/doc/timetracker/copyright diff --git a/debian/timetracker.prepare b/debian/timetracker.prepare index 7d9ccbc..e034513 100755 --- a/debian/timetracker.prepare +++ b/debian/timetracker.prepare @@ -7,7 +7,7 @@ cd Downloads if [ -d timetracker ] then cd timetracker - git fetch -t + git pull origin $(git rev-parse --abbrev-ref HEAD) else git clone https://github.com/anuko/timetracker cd timetracker @@ -16,5 +16,6 @@ fi # determine version version=$(grep "APP_VERSION" initialize.php |sed 's/define("APP_VERSION", "//' |sed 's/".*//') echo $version -echo "version=$version" >> ../../debian/setenv.sh +echo "export version=$version" >> ../../debian/setenv.sh +echo "version=$version" >> ../../debian/rules.pre -- 2.20.1