Browse Source

code tidy

pull/3002/head
Daniel Gibbs 5 years ago
parent
commit
bfc3e1e5c9
  1. 2
      lgsm/data/serverlist.csv
  2. 2
      lgsm/functions/command_validate.sh
  3. 4
      lgsm/functions/info_config.sh
  4. 2
      lgsm/functions/info_messages.sh
  5. 2
      lgsm/functions/update_steamcmd.sh

2
lgsm/data/serverlist.csv

@ -48,7 +48,7 @@ inss,inssserver,Insurgency: Sandstorm
ios,iosserver,IOSoccer ios,iosserver,IOSoccer
jc2,jc2server,Just Cause 2 jc2,jc2server,Just Cause 2
jc3,jc3server,Just Cause 3 jc3,jc3server,Just Cause 3
jk2,jk2server,Jedi Knight 2 jk2,jk2server,Jedi Knight II: Jedi Outcast
kf,kfserver,Killing Floor kf,kfserver,Killing Floor
kf2,kf2server,Killing Floor 2 kf2,kf2server,Killing Floor 2
l4d,l4dserver,Left 4 Dead l4d,l4dserver,Left 4 Dead

1 ac acserver Assetto Corsa
48 ios iosserver IOSoccer
49 jc2 jc2server Just Cause 2
50 jc3 jc3server Just Cause 3
51 jk2 jk2server Jedi Knight 2 Jedi Knight II: Jedi Outcast
52 kf kfserver Killing Floor
53 kf2 kf2server Killing Floor 2
54 l4d l4dserver Left 4 Dead

2
lgsm/functions/command_validate.sh

@ -39,12 +39,12 @@ fn_validate(){
else else
${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_info_print 70 +app_set_config 90 mod "${appidmod}" +app_update "${appid}" "${branch}" +app_update "${appid}" validate +quit | tee -a "${lgsmlog}" ${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_info_print 70 +app_set_config 90 mod "${appidmod}" +app_update "${appid}" "${branch}" +app_update "${appid}" validate +quit | tee -a "${lgsmlog}"
fi fi
elif [ "${shortname}" == "ac" ]||[ "${shortname}" == "jk2" ]; then
${unbuffer} ${steamcmdcommand} +@sSteamCmdForcePlatformType windows +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" validate +quit ${unbuffer} ${steamcmdcommand} +@sSteamCmdForcePlatformType windows +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" validate +quit
local exitcode=$? local exitcode=$?
# All other servers. # All other servers.
elif [ -n "${branch}" ]; then elif [ -n "${branch}" ]; then
${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" -beta "${branch}" validate +quit | tee -a "${lgsmlog}" ${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" -beta "${branch}" validate +quit | tee -a "${lgsmlog}"
elif [ "${shortname}" == "ac" ]||[ "${gamename}" == "Jedi Knight II: Jedi Outcast" ]; then
else else
${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" validate +quit | tee -a "${lgsmlog}" ${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" validate +quit | tee -a "${lgsmlog}"
fi fi

4
lgsm/functions/info_config.sh

@ -1591,8 +1591,8 @@ elif [ "${shortname}" == "q3" ]; then
# Quake Live # Quake Live
elif [ "${shortname}" == "ql" ]; then elif [ "${shortname}" == "ql" ]; then
fn_info_config_quakelive fn_info_config_quakelive
# Jedi Outcast # Jedi Knight II: Jedi Outcast
elif [ "${gamename}" == "Jedi Knight II: Jedi Outcast" ]; then elif [ "${shortname}" == "jk2" ]; then
fn_info_config_jk2 fn_info_config_jk2
# Minecraft # Minecraft
elif [ "${shortname}" == "mc" ]; then elif [ "${shortname}" == "mc" ]; then

2
lgsm/functions/info_messages.sh

@ -367,7 +367,7 @@ fn_info_message_gameserver(){
echo -e "${lightblue}Map rotation:\t${default}${randommap}" echo -e "${lightblue}Map rotation:\t${default}${randommap}"
fi fi
# Server Version (Jedi Knight 2) # Server Version (Jedi Knight II: Jedi Outcast)
if [ -n "${serverversion}" ]; then if [ -n "${serverversion}" ]; then
echo -e "${blue}Server Version:\t${default}${serverversion}" echo -e "${blue}Server Version:\t${default}${serverversion}"
fi fi

2
lgsm/functions/update_steamcmd.sh

@ -25,7 +25,7 @@ fn_update_steamcmd_dl(){
else else
${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" +quit | tee -a "${lgsmlog}" ${unbuffer} ${steamcmdcommand} +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" +quit | tee -a "${lgsmlog}"
fi fi
elif [ "${shortname}" == "ac" ]||[ "${gamename}" == "Jedi Knight II: Jedi Outcast" ]; then elif [ "${shortname}" == "ac" ]||[ "${shortname}" == "jk2" ]; then
${unbuffer} ${steamcmdcommand} +@sSteamCmdForcePlatformType windows +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" +quit ${unbuffer} ${steamcmdcommand} +@sSteamCmdForcePlatformType windows +login "${steamuser}" "${steampass}" +force_install_dir "${serverfiles}" +app_update "${appid}" +quit
# All other servers. # All other servers.
else else

Loading…
Cancel
Save