From 91f297df6673a0592f5f05abd7dd9dbc10ffe5aa Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 18 Jun 2017 22:07:32 +0100 Subject: [PATCH] reverted back to csv and removed . from PVKII --- lgsm/data/serverlist.csv | 68 ++++++++++++++++++++++++++++++++++++++++ lgsm/data/serverlist.tsv | 68 ---------------------------------------- linuxgsm.sh | 14 ++++----- 3 files changed, 74 insertions(+), 76 deletions(-) create mode 100644 lgsm/data/serverlist.csv delete mode 100644 lgsm/data/serverlist.tsv diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv new file mode 100644 index 000000000..9e82ea15a --- /dev/null +++ b/lgsm/data/serverlist.csv @@ -0,0 +1,68 @@ +arma3,arma3server,ARMA 3 +sdtd,sdtdserver,7 Days to Die +ark,arkserver,ARK: Survival Evolved +bo,boserver,Ballistic Overkill +bf1942,bf1942server,Battlefield 1942 +bmdm,bmdmserver,Black Mesa: Deathmatch +bs,bsserver,Blade Symphony +bb2,bb2server,BrainBread 2 +cod,codserver,Call of Duty +cod2,cod2server,Call of Duty 2 +cod4,cod4server,Call of Duty 4 +coduo,coduoserver,Call of Duty: United Offensive +codwaw,codwawserver,Call of Duty: World at War +cc,ccserver,Codename CURE +cs,csserver,Counter-Strike 1.6 +cscz,csczserver,Counter-Strike: Condition Zero +csgo,csgoserver,Counter-Strike: Global Offensive +css,cssserver,Counter-Strike: Source +dod,dodserver,Day of Defeat +dods,dodsserver,Day of Defeat: Source +doi,doiserver,Day of Infamy +dmc,dmcserver,Deathmatch Classic +dst,dstserver,Don't Starve Together +dab,dabserver,Double Action: Boogaloo +em,emserver,Empires Mod +fctr,fctrserver,Factorio +fof,fofserver,Fistful of Frags +gmod,gmodserver,Garrys Mod +ges,gesserver,GoldenEye: Source +hl2dm,hl2dmserver,Half-Life 2: Deathmatch +hldms,hldmsserver,Half-Life Deathmatch: Source +hldm,hldmserver,Half-Life: Deathmatch +hw,hwserver,Hurtworld +ins,insserver,Insurgency +jc2,jc2server,Just Cause 2 +kf,kfserver,Killing Floor +l4d,l4dserver,Left 4 Dead +l4d2,l4d2server,Left 4 Dead 2 +mc,mcserver,Minecraft +mta,mtaserver,Multi Theft Auto +mumble,mumbleserver,Mumble +ns2,ns2server,Natural Selection 2 +nmrih,nmrihserver,No More Room in Hell +ns2c,ns2cserver,NS2: Combat +opfor,opforserver,Opposing Force +pvkii,pvkiiserver,Pirates Vikings & Knights II +pc,pcserver,Project Cars +pz,pzserver,Project Zomboid +q2,q2server,Quake 2 +q3,q3server,Quake 3: Arena +ql,qlserver,Quake Live +qw,qwserver,Quake World +ro,roserver,Red Orchestra: Ostfront 41-45 +ricochet,ricochetserver,Ricochet +rust,rustserver,Rust +ss3,ss3server,Serious Sam 3: BFE +sb,sbserver,Starbound +sven,svenserver,Sven Co-op +tf2,tf2server,Team Fortress 2 +tfc,tfcserver,Team Fortress Classic +ts3,ts3server,Teamspeak 3 +tw,twserver,Teeworlds +terraria,terrariaserver,Terraria +tu,tuserver,Tower Unite +ut2k4,ut2k4server,Unreal Tournament 2004 +ut3,ut3server,Unreal Tournament 3 +ut99,ut99server,Unreal Tournament 99 +wet,wetserver,Wolfenstein: Enemy Territory diff --git a/lgsm/data/serverlist.tsv b/lgsm/data/serverlist.tsv deleted file mode 100644 index b671c06df..000000000 --- a/lgsm/data/serverlist.tsv +++ /dev/null @@ -1,68 +0,0 @@ -arma3 arma3server ARMA 3 -sdtd sdtdserver 7 Days to Die -ark arkserver ARK: Survival Evolved -bo boserver Ballistic Overkill -bf1942 bf1942server Battlefield 1942 -bmdm bmdmserver Black Mesa: Deathmatch -bs bsserver Blade Symphony -bb2 bb2server BrainBread 2 -cod codserver Call of Duty -cod2 cod2server Call of Duty 2 -cod4 cod4server Call of Duty 4 -coduo coduoserver Call of Duty: United Offensive -codwaw codwawserver Call of Duty: World at War -cc ccserver Codename CURE -cs csserver Counter-Strike 1.6 -cscz csczserver Counter-Strike: Condition Zero -csgo csgoserver Counter-Strike: Global Offensive -css cssserver Counter-Strike: Source -dod dodserver Day of Defeat -dods dodsserver Day of Defeat: Source -doi doiserver Day of Infamy -dmc dmcserver Deathmatch Classic -dst dstserver Don't Starve Together -dab dabserver Double Action: Boogaloo -em emserver Empires Mod -fctr fctrserver Factorio -fof fofserver Fistful of Frags -gmod gmodserver Garrys Mod -ges gesserver GoldenEye: Source -hl2dm hl2dmserver Half-Life 2: Deathmatch -hldms hldmsserver Half-Life Deathmatch: Source -hldm hldmserver Half-Life: Deathmatch -hw hwserver Hurtworld -ins insserver Insurgency -jc2 jc2server Just Cause 2 -kf kfserver Killing Floor -l4d l4dserver Left 4 Dead -l4d2 l4d2server Left 4 Dead 2 -mc mcserver Minecraft -mta mtaserver Multi Theft Auto -mumble mumbleserver Mumble -ns2 ns2server Natural Selection 2 -nmrih nmrihserver No More Room in Hell -ns2c ns2cserver NS2: Combat -opfor opforserver Opposing Force -pvkii pvkiiserver Pirates, Vikings, & Knights II -pc pcserver Project Cars -pz pzserver Project Zomboid -q2 q2server Quake 2 -q3 q3server Quake 3: Arena -ql qlserver Quake Live -qw qwserver Quake World -ro roserver Red Orchestra: Ostfront 41-45 -ricochet ricochetserver Ricochet -rust rustserver Rust -ss3 ss3server Serious Sam 3: BFE -sb sbserver Starbound -sven svenserver Sven Co-op -tf2 tf2server Team Fortress 2 -tfc tfcserver Team Fortress Classic -ts3 ts3server Teamspeak 3 -tw twserver Teeworlds -terraria terrariaserver Terraria -tu tuserver Tower Unite -ut2k4 ut2k4server Unreal Tournament 2004 -ut3 ut3server Unreal Tournament 3 -ut99 ut99server Unreal Tournament 99 -wet wetserver Wolfenstein: Enemy Territory diff --git a/linuxgsm.sh b/linuxgsm.sh index a02f62795..516f04fe6 100644 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -207,9 +207,9 @@ fn_install_menu() { eval "$resultvar=\"${selection}\"" } -# Gets server info from serverlist.tsv and puts in to array +# Gets server info from serverlist.csv and puts in to array fn_server_info(){ - IFS=" " + IFS="," server_info_array=($(grep -w "${userinput}" "${serverlist}")) shortname="${server_info_array[0]}" # csgo gameservername="${server_info_array[1]}" # csgoserver @@ -251,7 +251,6 @@ fn_install_file(){ echo "./${local_filename} details" fi echo "" - echo "server_info_array: ${server_info_array}" exit } @@ -270,16 +269,16 @@ fi if [ "${shortname}" == "core" ]; then userinput=$1 datadir="${tmpdir}/data" - serverlist="${datadir}/serverlist.tsv" + serverlist="${datadir}/serverlist.csv" # Download the serverlist. This is the complete list of all supported servers. if [ -f "${serverlist}" ]; then rm "${serverlist}" fi - fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.tsv" "${datadir}" "serverlist.tsv" "nochmodx" "norun" "noforcedl" "nomd5" + fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "serverlist.csv" "nochmodx" "norun" "noforcedl" "nomd5" if [ ! -f "${serverlist}" ]; then - echo "[ FAIL ] serverlist.tsv could not be loaded." + echo "[ FAIL ] serverlist.csv could not be loaded." exit 1 fi @@ -288,7 +287,7 @@ if [ "${shortname}" == "core" ]; then awk -F "," '{print $2 "\t" $3}' "${serverlist}" } | column -s $'\t' -t | more exit - elif [ "${userinput}" == "install" ]; then + elif [ "${userinput}" == "install" ]||[ "${userinput}" == "i" ]; then fn_install_menu result "LinuxGSM" "Select game to install" "${serverlist}" userinput="${result}" fn_server_info @@ -300,7 +299,6 @@ if [ "${shortname}" == "core" ]; then echo "[ FAIL ] menu result does not match gameservername" echo "result: ${result}" echo "gameservername: ${gameservername}" - echo "server_info_array: ${server_info_array}" fi elif [ -n "${userinput}" ]; then fn_server_info