File project.diff of Package minecraft-launcher

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package minecraft-launcher (Revision bbbed2c9b51aec6dc0d4478e63f343f8)

Currently displaying revision bbbed2c9b51aec6dc0d4478e63f343f8 , Show latest

--- minecraft-launcher.changes.orig
+++ minecraft-launcher.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Feb 22 16:03:44 UTC 2021 - Hans-Peter Jansen <hpj@urpla.net>
+
+- Update to the latest version
+- 2.2.1867
+
+-------------------------------------------------------------------
 Mon Feb  1 20:04:55 UTC 2021 - Simon Vogl <simon.vogl@gmx.net>
 
 - Update to the latest version
--- minecraft-launcher.spec.orig
+++ minecraft-launcher.spec
@@ -18,7 +18,7 @@
 
 
 Name:           minecraft-launcher
-Version:        2.2.1441
+Version:        2.2.1867
 Release:        0
 Summary:        Play Minecraft Java Edition
 License:        NonFree
--- update.sh.orig
+++ update.sh
@@ -3,11 +3,12 @@
 url=https://launcher.mojang.com/download/Minecraft.tar.gz
 tarball=Minecraft.tar.gz
 launcher=minecraft-launcher
+keep=0
 
 usage() {
     [ -n "$@" ] && echo -e "$@\n" >&2
     cat >&2 <<EOF
-Usage: $0 [-h]
+Usage: $0 [-h] [-k]
 
 Fetch $url from Mojang.
 Unpack $launcher from $tarball and attempt
@@ -18,11 +19,14 @@ EOF
 }
 
 recover() {
-    [ -f $tarball.old ] && mv $tarball.old $tarball
-    [ -d $launcher ] && rm -r $launcher
+    [ "$keep" -eq 0 ] && {
+        [ -f $tarball.old ] && mv $tarball.old $tarball
+	[ -d $launcher ] && rm -r $launcher
+    }
 }
 
 [ "$1" == "-h" ] && usage
+[ "$1" == "-k" ] && keep=1
 
 [ -f $tarball ] || usage "$tarball missing"
 
@@ -40,7 +44,8 @@ LANG=C wget $url || {
 
     tar xf $tarball $launcher/$launcher || usage "unpacking $launcher/$launcher from $tarball failed"
 
-    version=$(strings $launcher/$launcher | grep -E '[1-9]\.[0-9]\.[0-9][0-9][0-9][0-9][0-9]')
+    # attempt to match x.y.zzz..
+    version=$(strings $launcher/$launcher | grep -E '[1-9]\.[0-9]\.[0-9]{3,}')
 
     [ -z "$version" ] && usage "failed to match version pattern"
 
@@ -53,6 +58,10 @@ LANG=C wget $url || {
 
 	echo "update changes [key]"
 	read a
-	osc vc
+	osc vc && {
+	    keep=1
+	    [ -f $tarball.old ] && rm $tarball.old
+	    [ -d $launcher ] && rm -r $launcher
+	}
     }
 }

Places

File project.diff of Package minecraft-launcher (Revision bbbed2c9b51aec6dc0d4478e63f343f8)

Places