X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=update-openrocket;h=a323a555d0bf14c335243f13fd289f53dd38c97c;hb=afec18809652bb7370eb48e1d250668e0b663cda;hp=d84ce7f8204fe0588a0a0354701f9b986caf9309;hpb=03060508d21cfa8808cdee229ab7a877bca58b92;p=debian%2Fopenrocket

diff --git a/update-openrocket b/update-openrocket
index d84ce7f8..a323a555 100755
--- a/update-openrocket
+++ b/update-openrocket
@@ -122,16 +122,16 @@ wgetprogress=' -v --progress=dot:default '
 
 get_installed_version() {
 
-	installed=`unzip -p /usr/lib/openrocket/*.jar ReleaseNotes | head -1 | awk '{ print $2 }'`
+	installed=`unzip -p /usr/lib/openrocket/*.jar build.properties | grep build.version= | awk -F\= '{ print $2 }'`
 }
 
 get_download_url() {
-	url=`wget -qO - http://openrocket.sourceforge.net | grep https | grep download | awk -F\" '{ print $24 }'`
+	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,12 +169,12 @@ 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" )
 
 			echo "#!/bin/sh" > /usr/bin/openrocket
-			echo "exec java -jar /usr/lib/openrocket/OpenRocket-$upstream.jar \"\$@\"" >> /usr/bin/openrocket
+			echo "exec /usr/lib/jvm/java-8-openjdk-amd64/bin/java -jar /usr/lib/openrocket/OpenRocket-$upstream.jar \"\$@\"" >> /usr/bin/openrocket
 			chmod +x /usr/bin/openrocket
 
 			[ "$verbose" != "yes" ] || ( get_installed_version && echo "OpenRocket version: $installed" )