fix installer to work with new upstream location on github

diff --git a/debian/changelog b/debian/changelog
index acffb6a0f9896d698c71a9d584e1dde7a18b9cd4..d74c3d90eecb74af6fd0ed955ab79ec073171e42 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openrocket (15.03.2) unstable; urgency=medium
+
+  * rework code to fetch from new upstream home on github, closes: #760961
+
+ -- Bdale Garbee <bdale@gag.com>  Sat, 28 Jul 2018 10:29:19 +0800
+
 openrocket (15.03.1) unstable; urgency=low
 
   * add unzip dependency

diff --git a/debian/control b/debian/control
index dda091ff1813a86c3480a7c3137183b8736691ce..d843ca41c4571467350c4faf43d40f6f0bffc2a8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.6
 Homepage: http://openrocket.sourceforge.net/
 Vcs-Git: git://git.gag.com/debian/openrocket
-Vcs-Browser: http://git.gag.com/?p=debian/openrocket
+Vcs-Browser: https://git.gag.com/?p=debian/openrocket
 
 Package: openrocket
 Architecture: all

diff --git a/update-openrocket b/update-openrocket
index a18603a2aeb7e03da75ddb3eee868b8a6749d83c..0e908d83291d9ba8be311c7ff3e9d1f88cf8a9bd 100755 (executable)
--- a/update-openrocket
+++ b/update-openrocket
@@ -126,12 +126,12 @@ get_installed_version() {
 }
 
 get_download_url() {
-       url=`wget -qO - http://openrocket.sourceforge.net | grep https | grep download | awk -F\" '{ print $4 }'`
+       url=`wget --no-check-certificate -qO - https://openrocket.info | grep https | grep download | awk '{ print $5 }' | grep https | sed -e 's/href=\"//g' -e 's/\"//g'`
 }
 
 get_upstream_version() {
        get_download_url
-       upstream=`echo $url | awk -F/ '{ print $8 }'`
+       upstream=`echo $url | awk -F/ '{ print $8 }' | sed -e 's/release-//g'`
 }
 
 case "$ACTION" in
@@ -169,7 +169,7 @@ case "$ACTION" in
                        rm -f $targetdir/*.jar
 
                        [ "$verbose" != "yes" ] || echo "moving download to $targetdir ..."
-                       mv -f download $targetdir/OpenRocket-$upstream.jar
+                       mv -f OpenRocket-$upstream.jar $targetdir/OpenRocket-$upstream.jar
 
                        [ "$verbose" != "yes" ] || ( get_installed_version && echo "create /usr/bin/openrocket wrapper" )