summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2018-09-15 07:27:07 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-09-15 15:51:47 -0700
commit26d8beb7668d88124a954c163de9b1ce1b082c39 (patch)
treead513f555e1e06ee4fbf6f19a5f14dbb05957c30
parent7319b50a5d7c46abd7495aa51740ec6cb0ec0141 (diff)
downloadsubsurface-26d8beb7668d88124a954c163de9b1ce1b082c39.tar.gz
build-system: don't modify a file under git control
Instead of editing appdata/subsurface.appdata.xml in place, switch to our usual pattern of modifying a .in file and add the resulting file to .gitignore. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--.gitignore1
-rw-r--r--appdata/subsurface.appdata.xml.in (renamed from appdata/subsurface.appdata.xml)0
-rwxr-xr-xscripts/add-version-to-appdata.sh2
3 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 19e54b349..17ec19f15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ mobile-widgets/qml/kirigami
packaging/ios/install-root
packaging/ios/Info.plist
packaging/ios/Qt
+appdata/subsurface.appdata.xml
diff --git a/appdata/subsurface.appdata.xml b/appdata/subsurface.appdata.xml.in
index 8d25d5a36..8d25d5a36 100644
--- a/appdata/subsurface.appdata.xml
+++ b/appdata/subsurface.appdata.xml.in
diff --git a/scripts/add-version-to-appdata.sh b/scripts/add-version-to-appdata.sh
index a9f3b98ea..a0d8e1f5d 100755
--- a/scripts/add-version-to-appdata.sh
+++ b/scripts/add-version-to-appdata.sh
@@ -1,4 +1,4 @@
#!/bin/sh
version=$(git describe --abbrev=12)
date=$(git log -1 --format="%at" | xargs -I{} date -d @{} +%Y-%m-%d)
-sed -e "s|<release version=\"\" date=\"\" />|<release version=\"$version\" date=\"$date\" />|" -i appdata/subsurface.appdata.xml
+sed -e "s|<release version=\"\" date=\"\" />|<release version=\"$version\" date=\"$date\" />|" appdata/subsurface.appdata.xml.in > appdata/subsurface.appdata.xml