From d9775cde7873ccc0e43dda2753eb9771d53d2f6c Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Sat, 28 Jul 2018 10:29:54 +0800 Subject: [PATCH] fix installer to work with new upstream location on github --- debian/changelog | 6 ++++++ debian/control | 2 +- update-openrocket | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index acffb6a0..d74c3d90 100644 --- 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 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 dda091ff..d843ca41 100644 --- 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 a18603a2..0e908d83 100755 --- 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" ) -- 2.47.2