diff --git a/etc/change_hardcoded_world_name_first/game-install-ENLIVEN b/etc/change_hardcoded_world_name_first/game-install-ENLIVEN index dfd4fe8..3c425b4 100755 --- a/etc/change_hardcoded_world_name_first/game-install-ENLIVEN +++ b/etc/change_hardcoded_world_name_first/game-install-ENLIVEN @@ -12,30 +12,38 @@ # * Git version uses /home/*/minetest/games and /usr/local/share/minetest/games but the latter is used for minetestserver (minetest-server package) -#(Ubuntu 14.04 Trusty Tahr Server) folders were found using: +# (Ubuntu 14.04 Trusty Tahr Server) folders were found using: # cd / # sudo find -name 'worlds' (worlds folder is in $HOME/.minetest) # sudo find -name 'minimal' (stable build [such as 0.4.9 games folder is /usr/share/games/minetest/games, but git version games folder is /usr/local/share/minetest/games) -#NOTE: minetest mods are ALWAYS ONLY installed on server - +# NOTE: minetest mods are ALWAYS ONLY installed on server +mtgame_name="minetest_game" USR_SHARE_MINETEST=/usr/share/games/minetest -#IF git version is installed: -if [ -d "/usr/local/share/minetest" ]; then - USR_SHARE_MINETEST=/usr/local/share/minetest -fi -#UNUSED (unknown use): MT_GAMES_DIR=$HOME/.minetest/mods -#intentionally skip the slash in the following line since $USR_SHARE_MINETEST already starts with one: +try_path="/usr/share/minetest" +if [ -d "$try_path" ]; then + # Arch linux + USR_SHARE_MINETEST="$try_path" +fi +if [ ! -d "$USR_SHARE_MINETEST" ]; then + # IF git version is installed and regular one is NOT: + try_path="/usr/local/share/minetest" + if [ -d "$try_path" ]; then + USR_SHARE_MINETEST="$try_path" + fi +fi +# UNUSED (unknown use): MT_GAMES_DIR=$HOME/.minetest/mods +# intentionally skip the slash in the following line since $USR_SHARE_MINETEST already starts with one: MT_BACKUP_GAMES_DIR=$HOME/Backup$USR_SHARE_MINETEST/games MT_GAMES_DIR=$USR_SHARE_MINETEST/games MT_MYGAME_NAME=ENLIVEN MT_MYGAME_DIR=$MT_GAMES_DIR/$MT_MYGAME_NAME -#formerly MT_MYGAME_MODDIR: +# formerly MT_MYGAME_MODDIR: MT_MYGAME_MODS_PATH=$MT_MYGAME_DIR/mods MT_MYWORLD_NAME=FCAGameAWorld MT_MYWORLD_DIR=$HOME/.minetest/worlds/$MT_MYWORLD_NAME - -#BACKUP THE WORLD: +err_txt=$HOME/err-enliven.txt +# BACKUP THE WORLD: sudo chown $USER "$MT_MYWORLD_DIR/world.mt" sudo chown $USER "$MT_MYWORLD_DIR/world.mt.1st" if [ ! -d "$MT_MYGAME_DIR" ]; then @@ -78,11 +86,15 @@ fi #sudo mkdir "$MT_MYGAME_DIR" #sudo mkdir "$MT_MYGAME_MODS_PATH" if [ ! -d "$MT_MYGAME_DIR/" ]; then - echo "ERROR: failed to create $MT_MYGAME_DIR, so cannot continue." + echo "ERROR: failed to create $MT_MYGAME_DIR, so cannot continue." > $err_txt exit 1 fi -#sudo cp -R $USR_SHARE_MINETEST/games/minetest_game/mods/* "$MT_MYGAME_DIR/mods/" -sudo cp -R $USR_SHARE_MINETEST/games/minetest_game/* "$MT_MYGAME_DIR/" +#sudo cp -R $USR_SHARE_MINETEST/games/$mtgame_name/mods/* "$MT_MYGAME_DIR/mods/" +if [ -d "$USR_SHARE_MINETEST/games/minetest" ]; then + # Arch linux + mtgame_name="minetest" +fi +sudo cp -R $USR_SHARE_MINETEST/games/$mtgame_name/* "$MT_MYGAME_DIR/" #wget https://github.com/BlockMen/cme/releases/download/v2.3/cme-2_3-BlockMen.zip #unzip cme-2_3-BlockMen.zip @@ -113,7 +125,7 @@ mv $MTMOD_DL_ZIP $MTMOD_SRC_ZIP unzip $MTMOD_SRC_ZIP sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi echo "load_mod_mobs = true" >> "$MT_MYWORLD_DIR/world.mt" @@ -139,7 +151,7 @@ mv $MTMOD_DL_ZIP $MTMOD_SRC_ZIP unzip $MTMOD_SRC_ZIP sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi echo "load_mod_mobs_monster = true" >> "$MT_MYWORLD_DIR/world.mt" @@ -162,7 +174,7 @@ mv $MTMOD_DL_ZIP $MTMOD_SRC_ZIP unzip $MTMOD_SRC_ZIP sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi echo "load_mod_mobs_animal = true" >> "$MT_MYWORLD_DIR/world.mt" @@ -197,7 +209,7 @@ unzip $MTMOD_SRC_ZIP #sudo rm -Rf "$MT_MYGAME_MODS_PATH/protector-master" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -206,9 +218,9 @@ fi WRITEABLE_MINETEST_CONF=$HOME/minetest.conf rm -f "$HOME/minetest.conf" if [ ! -f "$USR_SHARE_MINETEST/games/$MT_MYGAME_NAME/minetest.conf" ]; then - sudo cp "$USR_SHARE_MINETEST/games/minetest_game/minetest.conf" "$USR_SHARE_MINETEST/games/$MT_MYGAME_NAME/minetest.conf.1st" + sudo cp "$USR_SHARE_MINETEST/games/$mtgame_name/minetest.conf" "$USR_SHARE_MINETEST/games/$MT_MYGAME_NAME/minetest.conf.1st" fi -cp "$USR_SHARE_MINETEST/games/minetest_game/minetest.conf" "$WRITEABLE_MINETEST_CONF" +cp "$USR_SHARE_MINETEST/games/$mtgame_name/minetest.conf" "$WRITEABLE_MINETEST_CONF" touch "$WRITEABLE_MINETEST_CONF" #4080 since boundaries in chunkymap/singleimage.py (to be compatible with approximate browser max image size) are -4096 to 4096 echo "map_generation_limit = 4096" >> "$WRITEABLE_MINETEST_CONF" @@ -254,7 +266,7 @@ unzip $MTMOD_SRC_ZIP mv $MTMOD_UNZ_NAME $MTMOD_DEST_NAME sudo mv $MTMOD_DEST_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -280,7 +292,7 @@ mv $MTMOD_DL_ZIP $MTMOD_SRC_ZIP unzip $MTMOD_SRC_ZIP sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi echo "load_mod_areas = true" >> "$MT_MYWORLD_DIR/world.mt" @@ -306,13 +318,13 @@ if [ ! -d "$MT_BACKUP_GAMES_DIR" ]; then mkdir -p "$MT_BACKUP_GAMES_DIR" #-p to make parent recursively fi - -if [ -d "$MT_BACKUP_GAMES_DIR/minetest_game_1st" ]; then - echo "already backed up $USR_SHARE_MINETEST/games/minetest_game" +first_suffix="_1st" +if [ -d "$MT_BACKUP_GAMES_DIR/$mtgame_name$first_suffix" ]; then + echo "already backed up $USR_SHARE_MINETEST/games/$mtgame_name" else - sudo cp -R "$USR_SHARE_MINETEST/games/minetest_game" "$MT_BACKUP_GAMES_DIR/" + sudo cp -R "$USR_SHARE_MINETEST/games/$mtgame_name" "$MT_BACKUP_GAMES_DIR/" fi -#sudo mv "$USR_SHARE_MINETEST/games/fca-game-a" "$USR_SHARE_MINETEST/games/minetest_game" +#sudo mv "$USR_SHARE_MINETEST/games/fca-game-a" "$USR_SHARE_MINETEST/games/$mtgame_name" #UNUSED, and is based on a much older version of minetest_game: #MTMOD_DL_ZIP=master.zip @@ -336,7 +348,7 @@ fi #unzip $MTMOD_SRC_ZIP #sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" #if [ ! -d "$MTMOD_DEST_PATH" ]; then -# echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." +# echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt # exit 1 #fi @@ -365,7 +377,7 @@ fi #2016-02-17 11:10:19: ERROR[Main]: ...al/share/minetest/games/enliven/mods/farming/init.lua:65: in main chunk # Remove & overwrite Farming REDO since it crashes 0.4.13 git 2016-02-16: #sudo rm -Rf $MT_MYGAME_MODS_PATH/farming -#sudo cp -R $USR_SHARE_MINETEST/games/minetest_game/mods/farming $MT_MYGAME_MODS_PATH/farming +#sudo cp -R $USR_SHARE_MINETEST/games/$mtgame_name/mods/farming $MT_MYGAME_MODS_PATH/farming MTMOD_DL_ZIP=master.zip MTMOD_SRC_ZIP=unified_inventory.zip @@ -386,7 +398,7 @@ mv $MTMOD_DL_ZIP $MTMOD_SRC_ZIP unzip $MTMOD_SRC_ZIP sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi echo "load_mod_unified_inventory = true" >> $MT_MYWORLD_DIR/world.mt @@ -415,7 +427,7 @@ mv $MTMOD_DL_ZIP $MTMOD_SRC_ZIP unzip $MTMOD_SRC_ZIP sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi echo "load_mod_technic = true" >> $MT_MYWORLD_DIR/world.mt @@ -441,10 +453,10 @@ if [ -f "tsm_gift_example" ]; then rm "tsm_gift_example" fi if [ -d "tsm_gift_example" ]; then - rm -Rvf "tsm_gift_example" + rm -Rf "tsm_gift_example" fi -if [ -f "tsm_chests_example" ]; then - rm "tsm_chests_example" +if [ -d "tsm_chests_example" ]; then + rm -Rf "tsm_chests_example" fi if [ -f "trm_default_example" ]; then rm "trm_default_example" @@ -465,7 +477,7 @@ wget http://axlemedia.net/abiyahh/users/Wuzzy/downloads/treasurer0.2.0.zip unzip $MTMOD_SRC_ZIP sudo mv -f $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi echo "load_mod_treasurer = true" >> $MT_MYWORLD_DIR/world.mt @@ -491,7 +503,7 @@ echo "load_mod_treasurer = true" >> $MT_MYWORLD_DIR/world.mt #unzip $MTMOD_SRC_ZIP #sudo mv -f $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" #if [ ! -d "$MTMOD_DEST_PATH" ]; then -# echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." +# echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt # exit 1 #fi @@ -527,7 +539,7 @@ git clone git://repo.or.cz/minetest_hudbars.git #aka http://repo.or.cz/w/minetest_hudbars.git sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -570,7 +582,7 @@ sudo rm "$MTMOD_DEST_PATH/hunger/init_UNUSED_sprint.lua" sudo mv "$MTMOD_DEST_PATH/hunger/init.lua" "$MTMOD_DEST_PATH/hunger/init_UNUSED_sprint.lua" sudo mv "$MTMOD_DEST_PATH/hunger/init_(nosprint).lua" "$MTMOD_DEST_PATH/hunger/init.lua" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi # END IF no hudbars mod @@ -603,7 +615,7 @@ git clone git://repo.or.cz/minetest_hbarmor.git #aka http://repo.or.cz/minetest_hbarmor.git/snapshot/bfc5f8cbb560eff6f206eec3242f8401d11c1310.zip sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -630,7 +642,7 @@ git clone git://repo.or.cz/minetest_hbhunger.git #aka http://repo.or.cz/minetest_hbhunger.git/snapshot/da70eba4fd0a9644cdb0a5b0d7ee3d93f7e61acf.zip sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -656,7 +668,7 @@ mv $MTMOD_DL_ZIP $MTMOD_SRC_ZIP unzip $MTMOD_SRC_ZIP sudo mv -f $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -680,7 +692,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -704,7 +716,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -732,7 +744,7 @@ mv "$MTMOD_DL_ZIP" "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -773,7 +785,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -796,7 +808,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -820,7 +832,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi #mv minetest-3d_armor-master minetest-3d_armor_MODPACK @@ -855,7 +867,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -889,7 +901,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -913,7 +925,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -942,6 +954,7 @@ MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/$MTMOD_DEST_NAME #if [ -d "$MTMOD_UNZ_NAME" ]; then rm -Rf $MTMOD_UNZ_NAME #fi +rm -Rf "" if [ -f "$MTMOD_DL_ZIP" ]; then rm -f "$MTMOD_DL_ZIP" fi @@ -950,10 +963,10 @@ if [ -f "$MTMOD_SRC_ZIP" ]; then fi wget https://github.com/Jeija/minetest-mod-mesecons/zipball/master mv master mesecons_modpack.zip -unzip mesecons_modpack.zip +unzip $MTMOD_SRC_ZIP sudo mv -f $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to create $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to create $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi #cd Jeija-minetest-mod-mesecons-* @@ -994,7 +1007,7 @@ unzip "$MTMOD_SRC_ZIP" #https://forum.minetest.net/viewtopic.php?f=11&t=10172&hilit=boost+cart sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1030,7 +1043,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1065,7 +1078,7 @@ fi git clone git://repo.or.cz/tsm_mines.git sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1097,7 +1110,7 @@ git clone git://repo.or.cz/RailCorridors/tsm_railcorridors.git #unzip * sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1123,7 +1136,7 @@ mv $MTMOD_DL_ZIP $MTMOD_SRC_ZIP unzip $MTMOD_SRC_ZIP sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1149,7 +1162,7 @@ mv $MTMOD_DL_ZIP $MTMOD_SRC_ZIP unzip $MTMOD_SRC_ZIP sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1174,7 +1187,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1225,7 +1238,7 @@ sudo mv minetest_playereffects "$MTMOD_DEST_PATH" #unzip $MTMOD_SRC_ZIP #sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" #if [ ! -d "$MTMOD_DEST_PATH" ]; then -# echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." +# echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt # exit 1 #fi @@ -1249,7 +1262,7 @@ mv $MTMOD_DL_ZIP $MTMOD_SRC_ZIP unzip $MTMOD_SRC_ZIP sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1274,7 +1287,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv -f $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1300,7 +1313,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv -f $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1337,7 +1350,7 @@ cd updater #unzip "$MTMOD_SRC_ZIP" #sudo mv -f $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" #if [ ! -d "$MTMOD_DEST_PATH" ]; then -# echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." +# echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt # exit 1 #fi @@ -1361,7 +1374,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv -f $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1386,7 +1399,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv -f $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1413,7 +1426,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1440,7 +1453,7 @@ unzip "$MTMOD_SRC_ZIP" #mv minetest_gamers-spawners-* minetest_gamers-spawners sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi echo "SPAWN_PYRAMIDS = true" > settings.txt @@ -1476,7 +1489,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1506,7 +1519,7 @@ fi ##sudo cp -f $MTMOD_UNZ_NAME/15px/* "$MTMOD_DEST_PATH/" #sudo cp -f $MTMOD_UNZ_NAME/31px/* "$MTMOD_DEST_PATH/" #if [ ! -d "$MTMOD_DEST_PATH" ]; then -# echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." +# echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt # exit 1 #fi @@ -1532,7 +1545,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1556,7 +1569,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1585,7 +1598,7 @@ unzip "$MTMOD_SRC_ZIP" sudo rm -Rf "$MTMOD_DEST_PATH" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1611,7 +1624,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1638,7 +1651,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1668,7 +1681,7 @@ fi git clone git://repo.or.cz/minetest_slimenodes.git sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1697,7 +1710,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1726,7 +1739,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1755,7 +1768,7 @@ mv $MTMOD_DL_ZIP "$MTMOD_SRC_ZIP" unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi @@ -1785,7 +1798,7 @@ unzip "$MTMOD_SRC_ZIP" sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" sudo rm -Rf "$MTMOD_DEST_PATH/etc" if [ ! -d "$MTMOD_DEST_PATH" ]; then - echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." + echo "ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt exit 1 fi