diff --git a/etc/change_hardcoded_world_and_username_manually_first/WIP (do not use)/nightly-cronjob b/etc/change_hardcoded_world_and_username_manually_first/WIP (do not use)/nightly-cronjob.sh similarity index 100% rename from etc/change_hardcoded_world_and_username_manually_first/WIP (do not use)/nightly-cronjob rename to etc/change_hardcoded_world_and_username_manually_first/WIP (do not use)/nightly-cronjob.sh diff --git a/etc/change_hardcoded_world_and_username_manually_first/backup-mts-world_cron b/etc/change_hardcoded_world_and_username_manually_first/backup-mts-world_cron.sh similarity index 100% rename from etc/change_hardcoded_world_and_username_manually_first/backup-mts-world_cron rename to etc/change_hardcoded_world_and_username_manually_first/backup-mts-world_cron.sh diff --git a/etc/change_hardcoded_world_and_username_manually_first/install-systemd-service b/etc/change_hardcoded_world_and_username_manually_first/install-systemd-service.sh similarity index 100% rename from etc/change_hardcoded_world_and_username_manually_first/install-systemd-service rename to etc/change_hardcoded_world_and_username_manually_first/install-systemd-service.sh diff --git a/etc/change_hardcoded_world_name_first/WIP (DO NOT USE)/redis-mtredisalize-start b/etc/change_hardcoded_world_name_first/WIP (DO NOT USE)/redis-mtredisalize-start.sh similarity index 100% rename from etc/change_hardcoded_world_name_first/WIP (DO NOT USE)/redis-mtredisalize-start rename to etc/change_hardcoded_world_name_first/WIP (DO NOT USE)/redis-mtredisalize-start.sh diff --git a/etc/change_hardcoded_world_name_first/backup-mts-world b/etc/change_hardcoded_world_name_first/backup-mts-world.sh similarity index 100% rename from etc/change_hardcoded_world_name_first/backup-mts-world rename to etc/change_hardcoded_world_name_first/backup-mts-world.sh diff --git a/etc/change_hardcoded_world_name_first/eauth b/etc/change_hardcoded_world_name_first/deprecated/eauth.sh similarity index 100% rename from etc/change_hardcoded_world_name_first/eauth rename to etc/change_hardcoded_world_name_first/deprecated/eauth.sh diff --git a/etc/change_hardcoded_world_name_first/editmtsconf b/etc/change_hardcoded_world_name_first/editmtsconf.sh similarity index 100% rename from etc/change_hardcoded_world_name_first/editmtsconf rename to etc/change_hardcoded_world_name_first/editmtsconf.sh diff --git a/etc/change_hardcoded_world_name_first/mts-ENLIVEN b/etc/change_hardcoded_world_name_first/mts-ENLIVEN.sh similarity index 100% rename from etc/change_hardcoded_world_name_first/mts-ENLIVEN rename to etc/change_hardcoded_world_name_first/mts-ENLIVEN.sh diff --git a/etc/change_hardcoded_world_name_first/nightly-sudoer-script b/etc/change_hardcoded_world_name_first/nightly-sudoer-script.sh similarity index 100% rename from etc/change_hardcoded_world_name_first/nightly-sudoer-script rename to etc/change_hardcoded_world_name_first/nightly-sudoer-script.sh diff --git a/etc/change_hardcoded_world_name_first/restore-env-meta b/etc/change_hardcoded_world_name_first/restore-env-meta.sh similarity index 100% rename from etc/change_hardcoded_world_name_first/restore-env-meta rename to etc/change_hardcoded_world_name_first/restore-env-meta.sh diff --git a/etc/change_hardcoded_world_name_first/use if you want/log_clear_mysql b/etc/change_hardcoded_world_name_first/use if you want/log_clear_mysql.sh similarity index 100% rename from etc/change_hardcoded_world_name_first/use if you want/log_clear_mysql rename to etc/change_hardcoded_world_name_first/use if you want/log_clear_mysql.sh diff --git a/etc/debugging/rm-minetest_game-mods-from-ENLIVEN b/etc/debugging/rm-minetest_game-mods-from-ENLIVEN.sh similarity index 100% rename from etc/debugging/rm-minetest_game-mods-from-ENLIVEN rename to etc/debugging/rm-minetest_game-mods-from-ENLIVEN.sh diff --git a/etc/git_all_push b/etc/git_all_push.sh similarity index 100% rename from etc/git_all_push rename to etc/git_all_push.sh diff --git a/install-ENLIVEN.sh b/etc/install-ENLIVEN-minetest_game.sh similarity index 100% rename from install-ENLIVEN.sh rename to etc/install-ENLIVEN-minetest_game.sh diff --git a/etc/bones.patch b/etc/merged with upstream/bones.patch similarity index 100% rename from etc/bones.patch rename to etc/merged with upstream/bones.patch diff --git a/etc/unused/minetestserver-install-git-ENABLE_REDIS b/etc/unused/minetestserver-install-git-ENABLE_REDIS.sh similarity index 100% rename from etc/unused/minetestserver-install-git-ENABLE_REDIS rename to etc/unused/minetestserver-install-git-ENABLE_REDIS.sh diff --git a/install.py b/install.py index 7025615..ce3bea6 100644 --- a/install.py +++ b/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 diff --git a/webapp/deploy-WIP-ENLIVEN.sh b/webapp/deploy-WIP-ENLIVEN.sh index 2c0d88b..ee745dc 100755 --- a/webapp/deploy-WIP-ENLIVEN.sh +++ b/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." diff --git a/webapp/install-mts.sh b/webapp/install-mts.sh new file mode 100644 index 0000000..3d103e1 --- /dev/null +++ b/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 diff --git a/webapp/reset-minetest.sh b/webapp/reset-minetest.sh index fc30b91..ddaf069 100755 --- a/webapp/reset-minetest.sh +++ b/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 " 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 " install.sh" echo echo