diff --git a/ORIGINAL_start.sh b/ORIGINAL_start.sh index 74c683d..bb0effb 100644 --- a/ORIGINAL_start.sh +++ b/ORIGINAL_start.sh @@ -89,47 +89,47 @@ # -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* # Load Mods # -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* -load_mods() { - if [ ! -f "$MOD_CACHE/$MAP_FOLDER_NAME/mods.txt" ] ; then - die "mods.txt list missing" - fi +# load_mods() { +# if [ ! -f "$MOD_CACHE/$MAP_FOLDER_NAME/mods.txt" ] ; then +# die "mods.txt list missing" +# fi - mkdir -p "$SERVER_HOME/mods" +# mkdir -p "$SERVER_HOME/mods" - _modstring="" - while read -r mod ; do - case $mod in - '@'*) - msg "- Found mod: $mod" - _modstring="$_modstring;mods/$mod" - do_sync "$MOD_CACHE/$MAP_FOLDER_NAME/$mod"/ "$SERVER_HOME/mods/$mod" +# _modstring="" +# while read -r mod ; do +# case $mod in +# '@'*) +# msg "- Found mod: $mod" +# _modstring="$_modstring;mods/$mod" +# do_sync "$MOD_CACHE/$MAP_FOLDER_NAME/$mod"/ "$SERVER_HOME/mods/$mod" - for addon_folder in addons Addons addon Addon ; do - if [ -d "$SERVER_HOME/mods/$mod/$addon_folder" ] ; then - for addon in "$SERVER_HOME/mods/$mod/$addon_folder"/* ; do - if [ ! -f "$SERVER_HOME/addons/${addon##*/}" ] ; then - cp -f "$addon" "$SERVER_HOME/addons/" - fi - done - fi - done +# for addon_folder in addons Addons addon Addon ; do +# if [ -d "$SERVER_HOME/mods/$mod/$addon_folder" ] ; then +# for addon in "$SERVER_HOME/mods/$mod/$addon_folder"/* ; do +# if [ ! -f "$SERVER_HOME/addons/${addon##*/}" ] ; then +# cp -f "$addon" "$SERVER_HOME/addons/" +# fi +# done +# fi +# done - for key_folder in keys Keys key Key ; do - if [ -d "$SERVER_HOME/mods/$mod/$key_folder" ] ; then - for key in "$SERVER_HOME/mods/$mod/$key_folder"/* ; do - if [ ! -f "$SERVER_HOME/keys/${key##*/}" ] ; then - cp -f "$key" "$SERVER_HOME/keys/" - fi - done - fi - done - esac - done < "$MOD_CACHE/$MAP_FOLDER_NAME/mods.txt" +# for key_folder in keys Keys key Key ; do +# if [ -d "$SERVER_HOME/mods/$mod/$key_folder" ] ; then +# for key in "$SERVER_HOME/mods/$mod/$key_folder"/* ; do +# if [ ! -f "$SERVER_HOME/keys/${key##*/}" ] ; then +# cp -f "$key" "$SERVER_HOME/keys/" +# fi +# done +# fi +# done +# esac +# done < "$MOD_CACHE/$MAP_FOLDER_NAME/mods.txt" - # trim the initial leading ';' - _modstring=${_modstring#;} - printf '%s\n' "$_modstring" > .modstring -} +# # trim the initial leading ';' +# _modstring=${_modstring#;} +# printf '%s\n' "$_modstring" > .modstring +# } # # -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* # # Load Map @@ -333,12 +333,12 @@ main() { # msg "Setting up environment" # setup_environment || die "Could not set up environment." - msg "Loading mods" - load_mods || die "Could not load mods" - mod_string=$(cat .modstring) + # msg "Loading mods" + # load_mods || die "Could not load mods" + # mod_string=$(cat .modstring) - msg "Loading stock map data" - load_stock_map_data || die "Could not load map" + # msg "Loading stock map data" + # load_stock_map_data || die "Could not load map" msg "Patching types.xml" patch_types || die "Failed to patch types" @@ -349,10 +349,6 @@ main() { msg "Creating custom types list" load_customtypes || die "Failed to load custom types" - echo '====================================' - printf '%s - Server started.\n' "$(date)" - echo '====================================' - # creating temp.bat here to avoid the arg max char limit of windows cmd.exe cat > temp.bat < .modstring + unset _modstring + + msg "Mods successfully loaded. Using modstring:" + printf '"%s"\n' "$(cat .modstring)" } # =================================================== @@ -164,6 +235,44 @@ start_server() { msg "Setting up environment" setup_environment || die "Could not set up environment." + + msg "Loading mods" + load_mods || die "Could not load mods" + mod_string=$(cat .modstring) + +# creating temp.bat here to avoid the arg max char limit of windows cmd.exe +cat > temp.bat </dev/null ||: + + msg "Sleeping 10 seconds to settle" + sleep 10 + msg "SERVER IS RESTARTING" + } # ===================================================