ソースを参照

Improved fn_autoip error message

* Added more clarity on how to resolve the multiple IP issue
Daniel Gibbs 12 年 前
コミット
5780829dfe

+ 1 - 1
CounterStrike/csserver

@@ -99,7 +99,7 @@ getipwc=$(ip -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|g
 if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 	if [ "${getipwc}" -ge "2" ]; then
 		echo -en "[\e[1;33m WARN \e[0;39m] Multiple active network interfaces.\n\n"
-		echo -en "Manually specify the IP you want to use in ${selfname}.\n"
+		echo -en "Manually specify the IP you want to use within the ${selfname} script.\n"
 		echo -en "Set ip=\"0.0.0.0\" to one of the following:\n"
 		echo -en "${getip}\n"
 		exit

+ 2 - 2
CounterStrikeConditionZero/csczserver

@@ -24,7 +24,7 @@ maxplayers="16"
 ip="0.0.0.0"
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 fn_parms(){
-parms="-game czero +map ${defaultmap} -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} -maxplayers ${maxplayers}"
+parms="-game czero +map ${defaultmap} -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} -maxplayers ${maxplayers} +servercfgfile ${servercfg}"
 }
 
 #### Advanced Variables ####
@@ -99,7 +99,7 @@ getipwc=$(ip -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|g
 if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 	if [ "${getipwc}" -ge "2" ]; then
 		echo -en "[\e[1;33m WARN \e[0;39m] Multiple active network interfaces.\n\n"
-		echo -en "Manually specify the IP you want to use in ${selfname}.\n"
+		echo -en "Manually specify the IP you want to use within the ${selfname} script.\n"
 		echo -en "Set ip=\"0.0.0.0\" to one of the following:\n"
 		echo -en "${getip}\n"
 		exit

+ 1 - 1
CounterStrikeGlobalOffensive/csgoserver

@@ -112,7 +112,7 @@ getipwc=$(ip -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|g
 if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 	if [ "${getipwc}" -ge "2" ]; then
 		echo -en "[\e[1;33m WARN \e[0;39m] Multiple active network interfaces.\n\n"
-		echo -en "Manually specify the IP you want to use in ${selfname}.\n"
+		echo -en "Manually specify the IP you want to use within the ${selfname} script.\n"
 		echo -en "Set ip=\"0.0.0.0\" to one of the following:\n"
 		echo -en "${getip}\n"
 		exit

+ 1 - 1
CounterStrikeSource/cssserver

@@ -100,7 +100,7 @@ getipwc=$(ip -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|g
 if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 	if [ "${getipwc}" -ge "2" ]; then
 		echo -en "[\e[1;33m WARN \e[0;39m] Multiple active network interfaces.\n\n"
-		echo -en "Manually specify the IP you want to use in ${selfname}.\n"
+		echo -en "Manually specify the IP you want to use within the ${selfname} script.\n"
 		echo -en "Set ip=\"0.0.0.0\" to one of the following:\n"
 		echo -en "${getip}\n"
 		exit

+ 2 - 2
DayOfDefeat/dodserver

@@ -24,7 +24,7 @@ maxplayers="16"
 ip="0.0.0.0"
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 fn_parms(){
-parms="-game dod +map ${defaultmap} -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} -maxplayers ${maxplayers}"
+parms="-game dod +map ${defaultmap} -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} -maxplayers ${maxplayers} +servercfgfile ${servercfg}"
 }
 
 #### Advanced Variables ####
@@ -99,7 +99,7 @@ getipwc=$(ip -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|g
 if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 	if [ "${getipwc}" -ge "2" ]; then
 		echo -en "[\e[1;33m WARN \e[0;39m] Multiple active network interfaces.\n\n"
-		echo -en "Manually specify the IP you want to use in ${selfname}.\n"
+		echo -en "Manually specify the IP you want to use within the ${selfname} script.\n"
 		echo -en "Set ip=\"0.0.0.0\" to one of the following:\n"
 		echo -en "${getip}\n"
 		exit

+ 1 - 1
DayOfDefeatSource/dodsserver

@@ -100,7 +100,7 @@ getipwc=$(ip -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|g
 if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 	if [ "${getipwc}" -ge "2" ]; then
 		echo -en "[\e[1;33m WARN \e[0;39m] Multiple active network interfaces.\n\n"
-		echo -en "Manually specify the IP you want to use in ${selfname}.\n"
+		echo -en "Manually specify the IP you want to use within the ${selfname} script.\n"
 		echo -en "Set ip=\"0.0.0.0\" to one of the following:\n"
 		echo -en "${getip}\n"
 		exit

+ 1 - 1
HalfLife2Deathmatch/hl2dmserver

@@ -100,7 +100,7 @@ getipwc=$(ip -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|g
 if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 	if [ "${getipwc}" -ge "2" ]; then
 		echo -en "[\e[1;33m WARN \e[0;39m] Multiple active network interfaces.\n\n"
-		echo -en "Manually specify the IP you want to use in ${selfname}.\n"
+		echo -en "Manually specify the IP you want to use within the ${selfname} script.\n"
 		echo -en "Set ip=\"0.0.0.0\" to one of the following:\n"
 		echo -en "${getip}\n"
 		exit

+ 2 - 2
HalfLifeDeathmatchClassic/hldmcserver

@@ -24,7 +24,7 @@ maxplayers="16"
 ip="0.0.0.0"
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 fn_parms(){
-parms="-game valve +map ${defaultmap} -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} -maxplayers ${maxplayers}"
+parms="-game valve +map ${defaultmap} -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} -maxplayers ${maxplayers} +servercfgfile ${servercfg}"
 }
 
 #### Advanced Variables ####
@@ -99,7 +99,7 @@ getipwc=$(ip -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|g
 if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 	if [ "${getipwc}" -ge "2" ]; then
 		echo -en "[\e[1;33m WARN \e[0;39m] Multiple active network interfaces.\n\n"
-		echo -en "Manually specify the IP you want to use in ${selfname}.\n"
+		echo -en "Manually specify the IP you want to use within the ${selfname} script.\n"
 		echo -en "Set ip=\"0.0.0.0\" to one of the following:\n"
 		echo -en "${getip}\n"
 		exit

+ 1 - 1
Insurgency/insserver

@@ -100,7 +100,7 @@ getipwc=$(ip -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|g
 if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 	if [ "${getipwc}" -ge "2" ]; then
 		echo -en "[\e[1;33m WARN \e[0;39m] Multiple active network interfaces.\n\n"
-		echo -en "Manually specify the IP you want to use in ${selfname}.\n"
+		echo -en "Manually specify the IP you want to use within the ${selfname} script.\n"
 		echo -en "Set ip=\"0.0.0.0\" to one of the following:\n"
 		echo -en "${getip}\n"
 		exit

+ 1 - 1
KillingFloor/kfserver

@@ -91,7 +91,7 @@ getipwc=$(ip -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|g
 if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 	if [ "${getipwc}" -ge "2" ]; then
 		echo -en "[\e[1;33m WARN \e[0;39m] Multiple active network interfaces.\n\n"
-		echo -en "Manually specify the IP you want to use in ${selfname}.\n"
+		echo -en "Manually specify the IP you want to use within the ${selfname} script.\n"
 		echo -en "Set ip=\"0.0.0.0\" to one of the following:\n"
 		echo -en "${getip}\n"
 		exit

+ 1 - 1
Left4Dead2/l4d2server

@@ -100,7 +100,7 @@ getipwc=$(ip -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|g
 if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 	if [ "${getipwc}" -ge "2" ]; then
 		echo -en "[\e[1;33m WARN \e[0;39m] Multiple active network interfaces.\n\n"
-		echo -en "Manually specify the IP you want to use in ${selfname}.\n"
+		echo -en "Manually specify the IP you want to use within the ${selfname} script.\n"
 		echo -en "Set ip=\"0.0.0.0\" to one of the following:\n"
 		echo -en "${getip}\n"
 		exit

+ 1 - 1
NaturalSelection2/ns2server

@@ -94,7 +94,7 @@ getipwc=$(ip -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|g
 if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 	if [ "${getipwc}" -ge "2" ]; then
 		echo -en "[\e[1;33m WARN \e[0;39m] Multiple active network interfaces.\n\n"
-		echo -en "Manually specify the IP you want to use in ${selfname}.\n"
+		echo -en "Manually specify the IP you want to use within the ${selfname} script.\n"
 		echo -en "Set ip=\"0.0.0.0\" to one of the following:\n"
 		echo -en "${getip}\n"
 		exit

+ 1 - 1
NoMoreRoomInHell/nmrihserver

@@ -100,7 +100,7 @@ getipwc=$(ip -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|g
 if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 	if [ "${getipwc}" -ge "2" ]; then
 		echo -en "[\e[1;33m WARN \e[0;39m] Multiple active network interfaces.\n\n"
-		echo -en "Manually specify the IP you want to use in ${selfname}.\n"
+		echo -en "Manually specify the IP you want to use within the ${selfname} script.\n"
 		echo -en "Set ip=\"0.0.0.0\" to one of the following:\n"
 		echo -en "${getip}\n"
 		exit

+ 1 - 1
RedOrchestra/roserver

@@ -87,7 +87,7 @@ getipwc=$(ip -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|g
 if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 	if [ "${getipwc}" -ge "2" ]; then
 		echo -en "[\e[1;33m WARN \e[0;39m] Multiple active network interfaces.\n\n"
-		echo -en "Manually specify the IP you want to use in ${selfname}.\n"
+		echo -en "Manually specify the IP you want to use within the ${selfname} script.\n"
 		echo -en "Set ip=\"0.0.0.0\" to one of the following:\n"
 		echo -en "${getip}\n"
 		exit

+ 1 - 1
TeamFortress2/tf2server

@@ -100,7 +100,7 @@ getipwc=$(ip -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|g
 if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 	if [ "${getipwc}" -ge "2" ]; then
 		echo -en "[\e[1;33m WARN \e[0;39m] Multiple active network interfaces.\n\n"
-		echo -en "Manually specify the IP you want to use in ${selfname}.\n"
+		echo -en "Manually specify the IP you want to use within the ${selfname} script.\n"
 		echo -en "Set ip=\"0.0.0.0\" to one of the following:\n"
 		echo -en "${getip}\n"
 		exit

+ 2 - 2
TeamFortressClassic/tfcserver

@@ -24,7 +24,7 @@ maxplayers="16"
 ip="0.0.0.0"
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Command-line_parameters_2
 fn_parms(){
-parms="-game tfc +map ${defaultmap} -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} -maxplayers ${maxplayers}"
+parms="-game tfc +map ${defaultmap} -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} -maxplayers ${maxplayers} +servercfgfile ${servercfg}"
 }
 
 #### Advanced Variables ####
@@ -99,7 +99,7 @@ getipwc=$(ip -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|g
 if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 	if [ "${getipwc}" -ge "2" ]; then
 		echo -en "[\e[1;33m WARN \e[0;39m] Multiple active network interfaces.\n\n"
-		echo -en "Manually specify the IP you want to use in ${selfname}.\n"
+		echo -en "Manually specify the IP you want to use within the ${selfname} script.\n"
 		echo -en "Set ip=\"0.0.0.0\" to one of the following:\n"
 		echo -en "${getip}\n"
 		exit

+ 1 - 1
UnrealTournament2004/ut2k4server

@@ -81,7 +81,7 @@ getipwc=$(ip -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|g
 if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 	if [ "${getipwc}" -ge "2" ]; then
 		echo -en "[\e[1;33m WARN \e[0;39m] Multiple active network interfaces.\n\n"
-		echo -en "Manually specify the IP you want to use in ${selfname}.\n"
+		echo -en "Manually specify the IP you want to use within the ${selfname} script.\n"
 		echo -en "Set ip=\"0.0.0.0\" to one of the following:\n"
 		echo -en "${getip}\n"
 		exit

+ 1 - 1
UnrealTournament99/ut99server

@@ -80,7 +80,7 @@ getipwc=$(ip -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|g
 if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 	if [ "${getipwc}" -ge "2" ]; then
 		echo -en "[\e[1;33m WARN \e[0;39m] Multiple active network interfaces.\n\n"
-		echo -en "Manually specify the IP you want to use in ${selfname}.\n"
+		echo -en "Manually specify the IP you want to use within the ${selfname} script.\n"
 		echo -en "Set ip=\"0.0.0.0\" to one of the following:\n"
 		echo -en "${getip}\n"
 		exit