[Git][debian-gis-team/josm-installer][master] Handle ~ suffix in update-linux.sh.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / josm-installer


Commits:
fe727125 by Bas Couwenberg at 2020-03-12T15:22:58+01:00
Handle ~ suffix in update-linux.sh.

- - - - -


2 changed files:

- debian/changelog
- update-linux.sh


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+josm-installer (0.0.1+svn16006~exp2) UNRELEASED; urgency=medium
+
+  * Handle ~ suffix in update-linux.sh.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 12 Mar 2020 15:20:23 +0100
+
 josm-installer (0.0.1+svn16006~exp1) experimental; urgency=medium
 
   * Initial release (Closes: #953722)


=====================================
update-linux.sh
=====================================
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 SVN_URL="https://josm.openstreetmap.de/svn/trunk/native/linux"
 
 CURDIR=$(readlink -f "$(dirname "$0")")
@@ -9,7 +11,7 @@ trap 'rm -rf "${TMPDIR}"; exit $?' INT TERM EXIT
 
 cd "${TMPDIR}" || exit 1
 
-LOCAL_REVISION=$(dpkg-parsechangelog -S Version -l "${CURDIR}/debian/changelog" | awk -F'+svn' '{print $2}')
+LOCAL_REVISION=$(dpkg-parsechangelog -S Version -l "${CURDIR}/debian/changelog" | awk -F'+svn' '{print $2}' | awk -F'~' '{print $1}')
 
 REMOTE_REVISION=$(svn info "${SVN_URL}" --show-item last-changed-revision)
 
@@ -25,8 +27,10 @@ fi
 
 svn export -q "${SVN_URL}" linux -r "${REMOTE_REVISION}"
 
+set +e
 diff -ruNq "${CURDIR}/linux" linux
 rc=$?
+set -e
 
 MESSAGE="Updated linux directory to r${REMOTE_REVISION}"
 



View it on GitLab: https://salsa.debian.org/debian-gis-team/josm-installer/-/commit/fe7271254742737b9ea7509da81b9c3581727b7a

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm-installer/-/commit/fe7271254742737b9ea7509da81b9c3581727b7a
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200312/2117e4cf/attachment-0001.html>