Просмотр исходного кода

Counter Strike is now Counter-Strike

Fixed game names
Daniel Gibbs 9 лет назад
Родитель
Сommit
ee392a3359

+ 2 - 2
CounterStrike/csserver

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Counter Strike
+# Counter-Strike
 # Server Management Script
 # Author: Daniel Gibbs
 # Website: https://gameservermanagers.com
@@ -57,7 +57,7 @@ appidmod="cstrike"
 
 # Server Details
 servicename="cs-server"
-gamename="Counter Strike 1.6"
+gamename="Counter-Strike 1.6"
 engine="goldsource"
 
 # Directories

+ 2 - 2
CounterStrikeConditionZero/csczserver

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Counter Strike: Condition Zero
+# Counter-Strike: Condition Zero
 # Server Management Script
 # Author: Daniel Gibbs
 # Website: https://gameservermanagers.com
@@ -57,7 +57,7 @@ appidmod="czero"
 
 # Server Details
 servicename="cscz-server"
-gamename="Counter Strike: Condition Zero"
+gamename="Counter-Strike: Condition Zero"
 engine="goldsource"
 
 # Directories

+ 2 - 2
CounterStrikeGlobalOffensive/csgoserver

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Counter Strike: Global Offensive
+# Counter-Strike: Global Offensive
 # Server Management Script
 # Author: Daniel Gibbs
 # Website: https://gameservermanagers.com
@@ -85,7 +85,7 @@ branch=""
 
 # Server Details
 servicename="csgo-server"
-gamename="Counter Strike: Global Offensive"
+gamename="Counter-Strike: Global Offensive"
 engine="source"
 
 # Directories

+ 2 - 2
CounterStrikeSource/cssserver

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Counter Strike: Source
+# Counter-Strike: Source
 # Server Management Script
 # Author: Daniel Gibbs
 # Website: https://gameservermanagers.com
@@ -62,7 +62,7 @@ appid="232330"
 
 # Server Details
 servicename="css-server"
-gamename="Counter Strike: Source"
+gamename="Counter-Strike: Source"
 engine="source"
 
 # Directories

+ 4 - 4
lgsm/functions/check_deps.sh

@@ -166,8 +166,8 @@ if [ -n "$(command -v dpkg-query)" ]; then
 	# 7 Days to Die
 	elif [ "${gamename}" ==  "7 Days To Die" ]; then
 		array_deps_required+=( telnet expect )
-	# No More Room in Hell, Counter Strike: Source and Garry's Mod
-	elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]; then
+	# No More Room in Hell, Counter-Strike: Source and Garry's Mod
+	elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter-Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]; then
 		if [ "${arch}" == "x86_64" ]; then
 			array_deps_required+=( lib32tinfo5 )
 		else
@@ -234,8 +234,8 @@ elif [ -n "$(command -v yum)" ]; then
 	# 7 Days to Die
 	elif [ "${gamename}" ==  "7 Days To Die" ]; then
 		array_deps_required+=( telnet expect )
-	# No More Room in Hell, Counter Strike: Source and Garry's Mod
-	elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]; then
+	# No More Room in Hell, Counter-Strike: Source and Garry's Mod
+	elif [ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Counter-Strike: Source" ]||[ "${gamename}" == "Garry's Mod" ]; then
 		array_deps_required+=( ncurses-libs.i686 )
 	# Brainbread 2 and Don't Starve Together
 	elif [ "${gamename}" == "Brainbread 2" ]||[ "${gamename}" == "Don't Starve Together" ]; then

+ 1 - 1
lgsm/functions/command_install.sh

@@ -28,7 +28,7 @@ fi
 
 # Configuration
 install_config.sh
-if [ "${gamename}" == "Counter Strike: Global Offensive" ]||[ "${gamename}" == "Team Fortress 2" ]||[ "${gamename}" == "BrainBread 2" ]; then
+if [ "${gamename}" == "Counter-Strike: Global Offensive" ]||[ "${gamename}" == "Team Fortress 2" ]||[ "${gamename}" == "BrainBread 2" ]; then
 	install_gslt.sh
 elif [ "${gamename}" == "TeamSpeak 3" ]; then
 	install_ts3db.sh

+ 4 - 0
lgsm/functions/core_functions.sh

@@ -8,6 +8,10 @@
 # Fixes for legacy code
 if [ "${gamename}" == "Teamspeak 3" ]; then
 	gamename="TeamSpeak 3"
+elif [ "${gamename}" == "Counter Strike: Global Offensive" ]; then
+	gamename="Counter-Strike: Global Offensive"
+elif [ "${gamename}" == "Counter Strike: Source" ]; then
+	gamename="Counter-Strike: Source"
 fi
 
 if [ "${emailnotification}" == "on" ]; then

+ 1 - 1
lgsm/functions/fix.sh

@@ -37,7 +37,7 @@ if [ "${function_selfname}" != "command_install.sh" ]; then
 
 	if  [ "${gamename}" == "ARMA 3" ]; then
 		fix_arma3.sh
-	elif [ "${gamename}" == "Counter Strike: Global Offensive" ]; then
+	elif [ "${gamename}" == "Counter-Strike: Global Offensive" ]; then
 		fix_csgo.sh
 	elif [ "${gamename}" == "Don't Starve Together" ]; then
 		fix_dst.sh

+ 4 - 4
lgsm/functions/install_config.sh

@@ -261,22 +261,22 @@ elif [ "${gamename}" == "Codename CURE" ]; then
 	wget -N /dev/null ${githuburl}/CodenameCURE/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq
 	sleep 1
 	fn_sourceconfig
-elif [ "${gamename}" == "Counter Strike 1.6" ]; then
+elif [ "${gamename}" == "Counter-Strike 1.6" ]; then
 	echo -e "downloading lgsm-default.cfg...\c"
 	wget -N /dev/null ${githuburl}/CounterStrike/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq
 	sleep 1
 	fn_goldsourceconfig
-elif [ "${gamename}" == "Counter Strike: Condition Zero" ]; then
+elif [ "${gamename}" == "Counter-Strike: Condition Zero" ]; then
 	echo -e "downloading lgsm-default.cfg...\c"
 	wget -N /dev/null ${githuburl}/CounterStrikeConditionZero/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq
 	sleep 1
 	fn_goldsourceconfig
-elif [ "${gamename}" == "Counter Strike: Global Offensive" ]; then
+elif [ "${gamename}" == "Counter-Strike: Global Offensive" ]; then
 	echo -e "downloading lgsm-default.cfg...\c"
 	wget -N /dev/null ${githuburl}/CounterStrikeGlobalOffensive/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq
 	sleep 1
 	fn_sourceconfig
-elif [ "${gamename}" == "Counter Strike: Source" ]; then
+elif [ "${gamename}" == "Counter-Strike: Source" ]; then
 	echo -e "downloading lgsm-default.cfg...\c"
 	wget -N /dev/null ${githuburl}/CounterStrikeSource/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq
 	sleep 1

+ 1 - 1
lgsm/functions/install_gslt.sh

@@ -12,7 +12,7 @@ echo ""
 echo "Game Server Login Token"
 echo "================================="
 sleep 1
-if [ "${gamename}" == "Counter Strike: Global Offensive" ]||[ "${gamename}" == "Counter Strike: Source" ]; then
+if [ "${gamename}" == "Counter-Strike: Global Offensive" ]||[ "${gamename}" == "Counter-Strike: Source" ]; then
 	echo "GSLT is required to run a public ${gamename} server"
 	fn_script_log_info "GSLT is required to run a public ${gamename} server"
 else