X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=5e713f9c3d0164670f499badd7562e3230af5f25;hp=d217389619a38a01c9d1d77b483ba53707a49df9;hb=e68fe4a5ace09a1af200a8c6a14e2f58d1dc7a6d;hpb=7e8af582d167cd9a0cd05ff85fa53c5365b75b3b;ds=sidebyside

diff --git a/all b/all
index d2173896..5e713f9c 100755
--- a/all
+++ b/all
@@ -33,10 +33,23 @@ msg()
 	echo "$*"
 }
 
-self=`cksum "$SELF"`
+checksum()
+{
+	if [ -x /usr/bin/md5sum ]; then
+		/usr/bin/md5sum "$@"
+	elif [ -x /bin/md5sum ]; then
+		/bin/md5sum "$@"
+	elif [ -x /usr/bin/cksum ]; then
+		/usr/bin/cksum "$@"
+	else
+		echo "NOCHECKSUM"
+	fi
+}
+
+self=`checksum "$SELF"`
 checkself()
 {
-	self_new=`cksum "$SELF"`
+	self_new=`checksum "$SELF"`
 	if [ x"$self" != x"$self_new" ]; then
 		msg "./all has changed."
 		if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
@@ -105,7 +118,7 @@ case "$cmd" in
 						fi
 						;;
 				esac
-				verbose git pull
+				verbose git pull || true # errors if the branch is not tracking anything
 				cd "$d00"
 				checkself "$SELF" "$@"
 				cd "$d0/$d"