From 904e4b51e29421540c11b06cdfa42c543c199f41 Mon Sep 17 00:00:00 2001
From: poikilos <7557867+poikilos@users.noreply.github.com>
Date: Fri, 15 Mar 2019 21:59:39 -0400
Subject: [PATCH] work on reset script

---
 webapp/reset-minetest.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/webapp/reset-minetest.sh b/webapp/reset-minetest.sh
index af8a5e9..0910aa1 100755
--- a/webapp/reset-minetest.sh
+++ b/webapp/reset-minetest.sh
@@ -9,16 +9,22 @@ in_use_name=minetest
 #  killall $in_use_name
 #fi
 url=https://downloads.minetest.org
-wget -O $zip_name $url/$zip_name || echo "no $zip_name at $url" && exit 1
+
+customDie () {
+    echo "$1"
+    exit 1
+}
+
+wget -O $zip_name $url/$zip_name || customDie "no $zip_name at $url"
 if [ -d "$extracted_name" ]; then
   if [ "`ls -lR $extracted_name/minetest/bin/*.png | wc -l`" -gt 0 ]; then
     if [ ! -d screenshots ]; then mkdir screenshots; fi
     # NOTE: system-wide install of minetest puts screenshots in ~/ (cwd)
-    mv $extracted_name/minetest/bin/*.png screenshots/ || exit 2
+    mv $extracted_name/minetest/bin/*.png screenshots/ || customDie "can't move screenshots from $extracted_name/minetest/bin/*.png"
   fi
-  rm -Rf "$extracted_name" || exit 3
+  rm -Rf "$extracted_name" || customDie "can't remove $extracted_name"
 fi
-unzip -u $zip_name || exit 4
+unzip -u $zip_name || customDie "Can't unzip $zip_name"
 cd "$extracted_name"
 echo "compiling libraries..."
 bash -e mtcompile-libraries.sh build >& libraries.log