From b80fd26e81d5de5c3b6871a565e8f7449df16bc5 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 29 Sep 2018 10:54:12 -0700 Subject: [PATCH] build-system: fix appdata creation The pipe in the execution apparently didn't fail, so the date wasn't set when building from a tar file. Signed-off-by: Dirk Hohndel --- scripts/add-version-to-appdata.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/add-version-to-appdata.sh b/scripts/add-version-to-appdata.sh index 7d48e840a..930db44ae 100755 --- a/scripts/add-version-to-appdata.sh +++ b/scripts/add-version-to-appdata.sh @@ -5,6 +5,9 @@ # this will, however, fail for plain tar balls create via git archive SCRIPT_DIR="$( cd "${BASH_SOURCE%/*}" ; pwd )" -version=$(git describe --abbrev=12) || version=$(cat "$SCRIPT_DIR"/../.gitversion) -date=$(git log -1 --format="%ct" | xargs -I{} date -d @{} +%Y-%m-%d) || date=$(cat "$SCRIPT_DIR"/../.gitdate) -sed -e "s|||" appdata/subsurface.appdata.xml.in > appdata/subsurface.appdata.xml +VERSION=$(git describe --abbrev=12) || VERSION=$(cat "$SCRIPT_DIR"/../.gitversion) +DATE=$(git log -1 --format="%ct" | xargs -I{} date -d @{} +%Y-%m-%d) +if [ "$DATE" = "" ] ; then + DATE=$(cat "$SCRIPT_DIR"/../.gitdate) +fi +sed -e "s|||" appdata/subsurface.appdata.xml.in > appdata/subsurface.appdata.xml