rename and organize files, add interim install

install.py

@@ -1,2 +1,4 @@
 #!/usr/bin/env python3
+import mtanalyze.minetestinfo
 print("This doesn't work (not yet implemented)")
+# https://github.com/poikilos/homedecor_ua

webapp/deploy-WIP-ENLIVEN.sh

@@ -8,7 +8,8 @@ fi
 dst="$HOME/EnlivenMinetest/webapp/linux-minetest-kit/minetest/games"
 echo "transferring to $dst..."
 rsync -rt WIP/ENLIVEN $dst
-dst="192.168.1.5:/home/owner/git/EnlivenMinetest/webapp/linux-minetest-kit/minetest/games"
+#OLD: dst="192.168.1.5:/home/owner/git/EnlivenMinetest/webapp/linux-minetest-kit/minetest/games"
+dst="192.168.1.5:$HOME/minetest/games"
 echo "transferring to $dst..."
 rsync -rt WIP/ENLIVEN $dst
 echo "Done."

webapp/install-mts.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+extracted_name=linux-minetest-kit
+flag_dir="$extracted_name/mtsrc"
+if [ ! -d "$flag_dir" ]; then
+    echo "ERROR: missing $flag_dir"
+    exit 1
+fi
+cd "$extracted_name"
+flag_file="minetest/bin/minetestserver"
+if [ -f "$flag_file" ]; then
+    rm -f "$flag_file"
+fi
+if [ -f "$flag_file" ]; then
+    echo "ERROR: Nothing done since can't remove old '$flag_file'"
+    exit 1
+fi
+if [ -f "mtcompile-program.pl" ]; then
+    # perl mtcompile-program.pl build >& program.log
+    perl mtcompile-program.pl build --server >& program.log
+else
+    # NOTE: no pl in $extracted_name, assuming bash:
+    bash -e mtcompile-program.sh build >& program.log
+fi
+if [ ! -f "$flag_file" ]; then
+    echo "ERROR: Build did not complete--missing '$flag_file'"
+    exit 1
+fi
+flag_file="$HOME/minetest/bin/minetestserver"
+if [ -f "$flag_file" ]; then
+    mv -f "$flag_file" "$flag_file.bak"
+fi
+if [ -f "$flag_file" ]; then
+    echo "ERROR: not complete since can't move old '$flag_file'"
+    exit 1
+fi
+rsync -rt minetest $HOME
+if [ ! -f "$flag_file" ]; then
+    echo "ERROR: not complete--couldn't create '$flag_file'"
+    exit 1
+fi
+flag_dir="$HOME/games/Bucket_Game"
+if [ ! -d "$flag_dir" ]; then
+    echo "ERROR: missing $flag_dir"
+    exit 1
+fi
+if [ ! -d "$HOME/games/ENLIVEN" ]; then
+    cp -R "$flag_dir" "$HOME/games/ENLIVEN"
+    echo
+else
+    rsync -rt "$flag_dir/mods/coderbuild/" "$HOME/games/ENLIVEN/mods/coderbuild"
+    rsync -rt "$flag_dir/mods/codercore/" "$HOME/games/ENLIVEN/mods/codercore"
+    rsync -rt "$flag_dir/mods/coderedit/" "$HOME/games/ENLIVEN/mods/coderedit"
+    rsync -rt "$flag_dir/mods/coderfood/" "$HOME/games/ENLIVEN/mods/coderfood"
+    rsync -rt "$flag_dir/mods/codermobs/" "$HOME/games/ENLIVEN/mods/codermobs"
+    rsync -rt "$flag_dir/mods/decorpack/" "$HOME/games/ENLIVEN/mods/decorpack"
+    rsync -rt "$flag_dir/mods/mtmachines/" "$HOME/games/ENLIVEN/mods/mtmachines"
+    # cp -f "$flag_dir/mods/LICENSE" "$HOME/games/ENLIVEN/mods/LICENSE"
+fi

webapp/reset-minetest.sh

@@ -15,16 +15,20 @@ 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 screenshots/*.png | wc -l`" -gt 0 ]; then
+    mv screenshots/*.png ~/ || customDie "can't move screenshots from $extracted_name/minetest/bin/*.png"
+    rmdir --ignore-fail-on-non-empty screenshots
+  fi
   if [ "`ls -lR $extracted_name/minetest/bin/*.png | wc -l`" -gt 0 ]; then
-    if [ ! -d screenshots ]; then mkdir screenshots; fi
+    # if [ ! -d screenshots ]; then mkdir screenshots; fi
     # NOTE: system-wide install of minetest puts screenshots in ~/ (cwd)
-    mv $extracted_name/minetest/bin/*.png screenshots/ || customDie "can't move screenshots from $extracted_name/minetest/bin/*.png"
+    mv $extracted_name/minetest/bin/*.png ~/ || customDie "can't move screenshots from $extracted_name/minetest/bin/*.png"
   fi
   rm -Rf "$extracted_name" || customDie "can't remove $extracted_name"
 fi
+
+wget -O $zip_name $url/$zip_name || customDie "no $zip_name at $url"
 unzip -u $zip_name || customDie "Can't unzip $zip_name"
 cd "$extracted_name"
 echo "compiling libraries..."
@@ -38,15 +42,9 @@ echo
 echo
 echo
 echo
+cd ..
 echo "Check libraries.log for errors, then..."
 echo "- Run the following manually:"
-if [ -f "$extracted_name/mtcompile-program.pl" ]; then
+echo "  install.sh"
-  echo "  cd '$extracted_name'"
-  echo "  perl mtcompile-program.pl build >& program.log"
-  echo "  # OR (server only):"
-  echo "  perl mtcompile-program.pl build --server >& program.log"
-else
-  echo "  cd '$extracted_name' && bash -e mtcompile-program.sh build >& program.log"
-fi
 echo
 echo