From b4477aba97d0c6bff27dd234ca18ec8382396a0a Mon Sep 17 00:00:00 2001
From: poikilos <7557867+poikilos@users.noreply.github.com>
Date: Fri, 15 Apr 2022 06:37:20 -0400
Subject: [PATCH] Make prepatch output more verbose. Try to build MultiCraft 2
 with the --2 option. Fix a bash function call.

---
 build-MultiCraft.sh    | 47 +++++++++++++++++++++++++++---------------
 build-minetest-here.sh |  2 +-
 prepatch.sh            |  6 +++---
 3 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/build-MultiCraft.sh b/build-MultiCraft.sh
index 7f8b1fb..a85d687 100755
--- a/build-MultiCraft.sh
+++ b/build-MultiCraft.sh
@@ -72,6 +72,7 @@ UNINSTALL=false
 CLEAN=false
 GET_WHAT=false
 USE_WHAT=false
+USE_2=false
 for var in "$@"
 do
     if [ "@$var" = "@--offline" ]; then
@@ -84,6 +85,8 @@ do
         CLEAN=true
     elif [ "@$var" = "@--what" ]; then
         GET_WHAT=true
+    elif [ "@$var" = "@--2" ]; then
+        USE_2=true
     elif [ "@$GET_WHAT" = "@true" ]; then
         if [ -d "$var" ]; then
             BUILD_WHAT="$var"
@@ -101,10 +104,16 @@ if [ "@$USE_WHAT" = "@true" ]; then
 fi
 
 BUILD_WHAT_DEFAULT=MultiCraft
+REPO_NAME=MultiCraft
+
+if [ "@$USE_2" = "@true" ]; then
+    BUILD_WHAT_DEFAULT=MultiCraft2
+    REPO_NAME=MultiCraft2
+fi
 
 # This is NOT a mistake (MultiCraft is the git username)...
 GIT_REPOS_DIR="$HOME/Downloads/git/MultiCraft"
-# ...so srcRepo should be MultiCraft/MultiCraft in this case
+# ...so srcRepo should be MultiCraft/$REPO_NAME in this case
 # (unless user ran script from a directory containing their own
 # MultiCraft directory).
 
@@ -119,10 +128,10 @@ if [ ! -d "$srcRepo" ]; then
     fi
 fi
 echo "* Using $srcRepo..."
-if [ ! -d /tmp/MultiCraft ]; then
-    mkdir /tmp/MultiCraft || customExit echo "mkdir -p '/tmp/MultiCraft' FAILED."
+if [ ! -d /tmp/$REPO_NAME ]; then
+    mkdir /tmp/$REPO_NAME || customExit echo "mkdir -p '/tmp/$REPO_NAME' FAILED."
 fi
-artifactsPath=/tmp/MultiCraft/src.txt
+artifactsPath=/tmp/$REPO_NAME/src.txt
 cat > $artifactsPath <<END
 .git
 .clang-format
@@ -151,15 +160,15 @@ END
 
 srcBin=$srcRepo/bin
 srcExe=$srcBin/MultiCraft
-iconCaption=MultiCraft
+iconCaption=$REPO_NAME
 dstShortcuts=$PREFIX/share/applications
-dstShortcut=$dstShortcuts/MultiCraft.desktop
+dstShortcut=$dstShortcuts/$REPO_NAME.desktop
 #dstPrograms="$HOME"
-#DESTINATION="$dstPrograms/MultiCraft"
-DESTINATION="$HOME/MultiCraft"
+#DESTINATION="$dstPrograms/$REPO_NAME"
+DESTINATION="$HOME/$REPO_NAME"
 dstIcon=minetest
 #tryIcon="$HOME/minetest/misc/minetest-xorg-icon-128.png"
-tryIcon="$DESTINATION/misc/MultiCraft-xorg-icon-128.png"
+tryIcon="$DESTINATION/misc/$REPO_NAME-xorg-icon-128.png"
 dstBin=$DESTINATION/bin
 dstExe=$dstBin/MultiCraft
 
@@ -175,10 +184,10 @@ if [ "@$UNINSTALL" = "@true" ]; then
     prevDir="`pwd`"
     echo "Uninstalling $DESTINATION..."
     cd "$DESTINATION" || customExit echo "cd $DESTINATION FAILED."
-    if [ ! -d /tmp/MultiCraft ]; then
-        mkdir /tmp/MultiCraft || customExit echo "mkdir -p '/tmp/MultiCraft' FAILED."
+    if [ ! -d /tmp/$REPO_NAME ]; then
+        mkdir /tmp/$REPO_NAME || customExit echo "mkdir -p '/tmp/MultiCraft' FAILED."
     fi
-    manifestPath=/tmp/MultiCraft/manifest.txt
+    manifestPath=/tmp/$REPO_NAME/manifest.txt
 cat > $manifestPath <<END
 games/default/files/bluestone/mesecons_pistons/textures/mesecons_piston_pusher_front_sticky.png
 games/default/files/bluestone/mesecons_pistons/textures/mesecons_piston_pusher_front.png
@@ -1815,7 +1824,7 @@ if [ "@$INSTALL" = "@true" ]; then
         rsync -rt --info=progress2 --exclude-from "$artifactsPath" "$srcRepo/" "$DESTINATION" || customExit "rsync failed."
     fi
     rm $artifactsPath
-    rmdir --ignore-fail-on-non-empty /tmp/MultiCraft
+    rmdir --ignore-fail-on-non-empty /tmp/$REPO_NAME
 
     if [ -f "$tryIcon" ]; then
         dstIcon="$tryIcon"
@@ -1884,18 +1893,20 @@ fi
 if [ ! -d "$srcRepo" ]; then
     cd "$GIT_REPOS_DIR" || customExit "cd '$GIT_REPOS_DIR' FAILED"
 fi
-goodFlagFile=MultiCraft/CMakeLists.txt
+goodFlagFile=$REPO_NAME/CMakeLists.txt
 if [ -f "`command -v git`" ]; then
     echo "In `pwd`..."
     if [ ! -d "$BUILD_WHAT" ]; then
         if [ "@$OFFLINE" = "@false" ]; then
-            git clone https://github.com/MultiCraft/MultiCraft.git || customExit "Cannot clone MultiCraft from `pwd`"
+            git clone https://github.com/MultiCraft/$REPO_NAME.git || customExit "Cannot clone $REPO_NAME from `pwd`"
         fi
         cd "$BUILD_WHAT" || customExit "Cannot cd '$BUILD_WHAT' from `pwd`"
     else
         cd "$BUILD_WHAT" || customExit "Cannot cd '$BUILD_WHAT' from `pwd`"
         if [ "@$OFFLINE" = "@false" ]; then
-            git pull || dieIfOnline "WARNING: Cannot pull '$BUILD_WHAT' from `pwd`"
+            echo "* origin of `pwd`:"
+            git remote show origin
+            git pull --verbose --ff-only || dieIfOnline "WARNING: Cannot pull '$BUILD_WHAT' from `pwd`"
         fi
     fi
 else
@@ -1922,7 +1933,9 @@ if [ ! -d "default" ]; then
 else
     if [ "@$OFFLINE" = "@false" ]; then
         cd default || customExit "cd default FAILED in `pwd`"
-        git pull || customExit "git pull FAILED in `pwd`"
+        echo "* origin of `pwd`:"
+        git remote show origin
+        git pull --verbose --ff-only || customExit "git pull FAILED in `pwd`"
         cd .. || customExit "cd .. FAILED in `pwd`"
     fi
 fi
diff --git a/build-minetest-here.sh b/build-minetest-here.sh
index d4dc76b..cca5feb 100755
--- a/build-minetest-here.sh
+++ b/build-minetest-here.sh
@@ -118,7 +118,7 @@ echo
 echo "RUN_IN_PLACE=$RUN_IN_PLACE"
 if [ "$RUN_IN_PLACE" = "0" ]; then
     echo "^ To change this, press Ctrl+C and use:"
-    usage()
+    usage
     echo
     echo "3..."
     sleep 1
diff --git a/prepatch.sh b/prepatch.sh
index 078efb1..a262f72 100755
--- a/prepatch.sh
+++ b/prepatch.sh
@@ -143,8 +143,8 @@ elif [ "@$enable_install" = "@true" ]; then
     else
         customExit "Cannot detect mods directory in $branchHeadPath/mods"
     fi
-    echo "rsync -rt $patch_game_src/ $HOME/minetest/games/ENLIVEN..."
-    rsync -rt "$patch_game_src/" "$HOME/minetest/games/ENLIVEN"
+    echo "rsync -rtv $patch_game_src/ $HOME/minetest/games/ENLIVEN..."
+    rsync -rtv "$patch_game_src/" "$HOME/minetest/games/ENLIVEN"
     # echo "#patches:$patches"
     # echo "#branch:$branch"
     echo "Done."
@@ -316,5 +316,5 @@ done
 
 echo "Done."
 echo "To apply, set BUCKET_GAME then:"
-echo "cd EnlivenMinetest && git pull && rsync -rt Bucket_Game-branches/$branch/ \$BUCKET_GAME"
+echo "cd EnlivenMinetest && git pull && rsync -rtv Bucket_Game-branches/$branch/ \$BUCKET_GAME"
 echo