Snap: Remove tag hack & remove 'g' from git hash

This commit is contained in:
Maximilian Federle
2019-07-17 17:49:48 +02:00
parent cb734a0581
commit ccc43c8167

View File

@@ -116,11 +116,7 @@ parts:
source: . source: .
override-pull: | override-pull: |
snapcraftctl pull snapcraftctl pull
if ! git describe --dirty; then snap_version=$(git describe --dirty | sed -e 's/g//;s/-/+git/;y/-/./')
rc2_parent="a8789f7"
git -c user.name="snapcraft" -c user.email="snapcraft@local.build" tag -a "0.7RC2" -m "stand-in tag" "$rc2_parent"
fi
snap_version=$(git describe --dirty | sed -e 's/-/+git/;y/-/./')
modified_displayed_version=$snap_version".snap" modified_displayed_version=$snap_version".snap"
sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h
snapcraftctl set-version "$snap_version" snapcraftctl set-version "$snap_version"