[arch-commits] Commit in josm/trunk (PKGBUILD josm.changelog)

[Jaroslav Lichtblau]

    Date: Sunday, November 17, 2013 @ 18:55:15
  Author: jlichtblau
Revision: 101115

upgpkg: josm 6388-1

Modified:
  josm/trunk/PKGBUILD
  josm/trunk/josm.changelog

----------------+
 PKGBUILD       |   15 +++++++++------
 josm.changelog |    4 ++++
 2 files changed, 13 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-17 12:54:42 UTC (rev 101114)
+++ PKGBUILD	2013-11-17 17:55:15 UTC (rev 101115)
@@ -3,7 +3,7 @@
 # Contributor: Michele Schäuble <mschaeuble at swissonline.ch>
 
 pkgname=josm
-pkgver=6383
+pkgver=6388
 pkgrel=1
 pkgdesc="An editor for OpenStreetMap written in Java"
 arch=('any')
@@ -15,7 +15,7 @@
 source=(http://josm.openstreetmap.de/$pkgname-tested.jar \
         $pkgname.desktop \
         $pkgname.conf.d)
-sha256sums=('ec5c49dd64f81160de8a5e3abb7b6f05fee0fff663bd0d855b9b0dd6a8bb6735'
+sha256sums=('e21d389a0a59d8968ed70a393b86e4ca6f140d50094f773528418774fcdaf151'
             'edfb2cbf2aa7e6582b4d43cd402ea58be7990702e5ffffc3ff7afdc518c28ca9'
             'c86a73251eed42fcb129ae9b88a0ee3cf03d8d00a9385519ad536d5af0907663')
 
@@ -33,10 +33,13 @@
   cat <<"EOF" >${pkgdir}/usr/bin/$pkgname 
 #!/bin/sh
 # source application-specific settings
-JOSM_ARGS=
-[ -f /etc/conf.d/josm ] && . /etc/conf.d/josm
-CLASSPATH="/usr/share/java/josm/josm.jar"
-java ${JOSM_ARGS} -cp "${CLASSPATH}" org.openstreetmap.josm.gui.MainApplication "$@" 
+while true; do
+    JOSM_ARGS=
+    [ -f /etc/conf.d/josm ] && . /etc/conf.d/josm
+    CLASSPATH="/usr/share/java/josm/josm.jar"
+    java ${JOSM_ARGS} -cp "${CLASSPATH}" -Djosm.restart=true org.openstreetmap.josm.gui.MainApplication "$@"
+    [ $? -eq 9 ] || break
+done
 EOF
   chmod 755 ${pkgdir}/usr/bin/$pkgname
   install -Dm644 ${srcdir}/$pkgname.conf.d ${pkgdir}/etc/conf.d/$pkgname

Modified: josm.changelog
===================================================================
--- josm.changelog	2013-11-17 12:54:42 UTC (rev 101114)
+++ josm.changelog	2013-11-17 17:55:15 UTC (rev 101115)
@@ -1,4 +1,8 @@
 2013-11-17 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+	* josm 6388-1
+	* fixed FS#37321 - [josm] JOSM restart command does not work
+
+2013-11-17 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
 	* josm 6383-1
 
 2013-09-02 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>