diff --git a/functions/fix_arma3.sh b/functions/fix_arma3.sh index c6b6ece0c..75db601a9 100644 --- a/functions/fix_arma3.sh +++ b/functions/fix_arma3.sh @@ -6,7 +6,7 @@ lgsm_version="301215" # Fixes line 63: 20150 Segmentation fault (core dumped) #488 -fn_fix_steamcmd_msg_start(){ +fn_msg_start(){ fn_printdots "Applying ${fixname} fix: ${gamename}" sleep 1 fn_printinfo "Applying ${fixname} fix: ${gamename}" @@ -14,7 +14,7 @@ fn_fix_steamcmd_msg_start(){ sleep 1 } -fn_fix_steamcmd_msg_end(){ +fn_msg_end(){ if [ $? -ne 0 ]; then fn_printfailnl "Applying ${fixname} fix: ${gamename}" fn_scriptlog "Failure! Applying ${fixname} fix: ${gamename}" @@ -27,7 +27,7 @@ fn_fix_steamcmd_msg_end(){ # Fixes: server not always creating steam_appid.txt file. if [ -d "${rootdir}/.local/share/Arma\ 3" ]; then local fixname="20150 Segmentation fault (core dumped)" - fn_fix_steamcmd_msg_start + fn_msg_start mkdir -p "${rootdir}/.local/share/Arma\ 3" - fn_fix_steamcmd_msg_end + fn_msg_end fi \ No newline at end of file diff --git a/functions/fix_csgo.sh b/functions/fix_csgo.sh index 084fd70d3..4227d36eb 100644 --- a/functions/fix_csgo.sh +++ b/functions/fix_csgo.sh @@ -6,7 +6,7 @@ lgsm_version="301215" # Description: Resolves various issues with csgo. -fn_fix_steamcmd_msg_start(){ +fn_msg_start(){ fn_printdots "Applying ${fixname} fix: ${gamename}" sleep 1 fn_printinfo "Applying ${fixname} fix: ${gamename}" @@ -14,7 +14,7 @@ fn_fix_steamcmd_msg_start(){ sleep 1 } -fn_fix_steamcmd_msg_end(){ +fn_msg_end(){ if [ $? -ne 0 ]; then fn_printfailnl "Applying ${fixname} fix: ${gamename}" fn_scriptlog "Failure! Applying ${fixname} fix: ${gamename}" @@ -27,35 +27,35 @@ fn_fix_steamcmd_msg_end(){ # Fixes: server not always creating steam_appid.txt file. if [ ! -f "${filesdir}/steam_appid.txt" ]; then local fixname="730 steam_appid.txt" - fn_fix_steamcmd_msg_start + fn_msg_start echo -n "730" >> "${filesdir}/steam_appid.txt" - fn_fix_steamcmd_msg_end + fn_msg_end fi # Fixes: Error parsing BotProfile.db - unknown attribute 'Rank'". if ! grep -q "//Rank" "${systemdir}/botprofile.db" > /dev/null 2>&1; then local fixname="botprofile.db" - fn_fix_steamcmd_msg_start + fn_msg_start sed -i 's/\tRank/\t\/\/Rank/g' "${systemdir}/botprofile.db" > /dev/null 2>&1 - fn_fix_steamcmd_msg_end + fn_msg_end fi # Fixes: Unknown command "cl_bobamt_vert". if ! grep -q "//exec default" "${servercfgdir}/valve.rc" > /dev/null 2>&1 || ! grep -q "//exec joystick" "${servercfgdir}/valve.rc" > /dev/null 2>&1; then local fixname="valve.rc" - fn_fix_steamcmd_msg_start + fn_msg_start sed -i 's/exec default.cfg/\/\/exec default.cfg/g' "${servercfgdir}/valve.rc" > /dev/null 2>&1 sed -i 's/exec joystick.cfg/\/\/exec joystick.cfg/g' "${servercfgdir}/valve.rc" > /dev/null 2>&1 - fn_fix_steamcmd_msg_end + fn_msg_end fi # Fixes: workshop map issue. # http://forums.steampowered.com/forums/showthread.php?t=3170366. if [ -f "${systemdir}/subscribed_collection_ids.txt" ]||[ -f "${systemdir}/subscribed_file_ids.txt" ]||[ -f "${systemdir}/ugc_collection_cache.txt" ]; then local fixname="workshop map" - fn_fix_steamcmd_msg_start + fn_msg_start rm -f "${systemdir}/subscribed_collection_ids.txt" rm -f "${systemdir}/subscribed_file_ids.txt" rm -f "${systemdir}/ugc_collection_cache.txt" - fn_fix_steamcmd_msg_end + fn_msg_end fi \ No newline at end of file diff --git a/functions/fix_steamcmd.sh b/functions/fix_steamcmd.sh index 070ce7165..410574263 100644 --- a/functions/fix_steamcmd.sh +++ b/functions/fix_steamcmd.sh @@ -6,7 +6,7 @@ lgsm_version="301215" # Description: fixes various issues related to steamCMD. -fn_fix_steamcmd_msg_start(){ +fn_msg_start(){ fn_printdots "Applying ${fixname} fix: ${gamename}" sleep 1 fn_printinfo "Applying ${fixname} fix: ${gamename}" @@ -14,7 +14,7 @@ fn_fix_steamcmd_msg_start(){ sleep 1 } -fn_fix_steamcmd_msg_end(){ +fn_msg_end(){ if [ $? -ne 0 ]; then fn_printfailnl "Applying ${fixname} fix: ${gamename}" fn_scriptlog "Failure! Applying ${fixname} fix: ${gamename}" @@ -28,43 +28,43 @@ fn_fix_steamcmd_msg_end(){ # Fixes: [S_API FAIL] SteamAPI_Init() failed; unable to locate a running instance of Steam,or a local steamclient.so. if [ ! -f "${HOME}/.steam/sdk32/steamclient.so" ]; then local fixname="steamclient.so general" - fn_fix_steamcmd_msg_start + fn_msg_start mkdir -pv "${HOME}/.steam/sdk32" >> "${scriptlog}" cp -v "${rootdir}/steamcmd/linux32/steamclient.so" "${HOME}/.steam/sdk32/steamclient.so" >> "${scriptlog}" - fn_fix_steamcmd_msg_end + fn_msg_end fi if [ "${gamename}" == "Garry's Mod" ]; then # Fixes: .steam/sdk32/libsteam.so: cannot open shared object file: No such file or directory if [ ! -f "${HOME}/.steam/sdk32/libsteam.so" ]; then local fixname="libsteam.so" - fn_fix_steamcmd_msg_start + fn_msg_start mkdir -pv "${HOME}/.steam/sdk32" >> "${scriptlog}" cp -v "${filesdir}/bin/libsteam.so" "${HOME}/.steam/sdk32/libsteam.so" >> "${scriptlog}" - fn_fix_steamcmd_msg_end + fn_msg_end fi elif [ "${gamename}" == "Serious Sam 3: BFE" ]; then # Fixes: .steam/bin32/libsteam.so: cannot open shared object file: No such file or directory if [ ! -f "${HOME}/.steam/bin32/libsteam.so" ]; then local fixname="libsteam.so" - fn_fix_steamcmd_msg_start + fn_msg_start mkdir -pv "${HOME}/.steam/bin32" >> "${scriptlog}" cp -v "${filesdir}/Bin/libsteam.so" "${HOME}/.steam/bin32/libsteam.so" >> "${scriptlog}" - fn_fix_steamcmd_msg_end + fn_msg_end fi elif [ "${gamename}" == "Hurtworld" ]; then # Fixes: [S_API FAIL] SteamAPI_Init() failed; unable to locate a running instance of Steam, or a local steamclient.so. if [ ! -f "${filesdir}/Hurtworld_Data/Plugins/x86/steamclient.so" ]; then local fixname="steamclient.so x86" - fn_fix_steamcmd_msg_start + fn_msg_start cp -v "${rootdir}/steamcmd/linux32/steamclient.so" "${filesdir}/Hurtworld_Data/Plugins/x86/steamclient.so" >> "${scriptlog}" - fn_fix_steamcmd_msg_end + fn_msg_end fi if [ ! -f "${filesdir}/Hurtworld_Data/Plugins/x86_64/steamclient.so" ]; then local fixname="steamclient.so x86_64" - fn_fix_steamcmd_msg_start + fn_msg_start cp -v "${rootdir}/steamcmd/linux32/steamclient.so" "${filesdir}/Hurtworld_Data/Plugins/x86_64/steamclient.so" >> "${scriptlog}" - fn_fix_steamcmd_msg_end + fn_msg_end fi fi