Sfoglia il codice sorgente

Merge pull request #1003 from dgibbs64/development

glibcfix improvements
Daniel Gibbs 9 anni fa
parent
commit
8ea0d91a72

+ 0 - 0
DontStarveTogether/lgsm-default.ini → DontStarveTogether/cfg/lgsm-default.ini


BIN
DontStarveTogether/dependencies/libc.so.6


BIN
DontStarveTogether/dependencies/libpthread.so.0


BIN
DontStarveTogether/dependencies/librt.so.1


BIN
DoubleActionBoogaloo/dependencies/libm.so.6


+ 1 - 1
lgsm/functions/check.sh

@@ -75,7 +75,7 @@ do
 	fi
 done
 
-local allowed_commands_array=( command_install.sh command_start.sh command_debug.sh )
+local allowed_commands_array=( command_debug.sh command_start.sh command_install.sh )
 for allowed_command in "${allowed_commands_array[@]}"
 do
 	if [ "${allowed_command}" == "${function_selfname}" ]; then

+ 5 - 3
lgsm/functions/check_system_requirements.sh

@@ -22,12 +22,14 @@ if [ "${gamename}" == "ARMA 3" ]; then
 fi
 
 # If the game or engine has a minimum RAM Requirement, compare it to system's available RAM.
-if [ -n "${ramrequirement}" ]; then
+if [ -n "${ramrequirementmb}" ]; then
 	if [ "${physmemtotalmb}" -lt "${ramrequirementmb}" ]; then
+		fn_print_dots "Check RAM"
+		sleep 0.5
 		# Warn the user
-		fn_print_warn "Insufficient memory: ${ramrequirementgb}G required, ${physmemtotal} available"
+		fn_print_warn_nl "Check RAM: ${ramrequirementgb}G required, ${physmemtotal} available"
 		sleep 1
-		fn_print_warning "You may experiance poor performance from your server"
+		echo  "	* ${gamename} server may fail to run or experience poor performance."
 		sleep 1
 	fi
 fi

+ 1 - 1
lgsm/functions/fix_glibc.sh

@@ -16,7 +16,7 @@ do
 	fi
 done
 
-local libm_servers_array=( "Codename CURE" "Double Action: Boogaloo" "Fistful of Frags" "Garry's Mod" "Insurgency" "Natural Selection 2" "NS2: Combat" "No More Room in Hell" )
+local libm_servers_array=( "Codename CURE" "Day of Infamy" "Double Action: Boogaloo" "Empires Mod" "Fistful of Frags" "Garry's Mod" "Insurgency" "Natural Selection 2" "NS2: Combat" "No More Room in Hell" )
 for libm_server in "${libm_servers_array[@]}"
 do
 	if [ "${gamename}" == "${libm_server}" ]; then

+ 6 - 0
lgsm/functions/info_glibc.sh

@@ -11,9 +11,15 @@ if [ "${gamename}" == "Blade Symphony" ]; then
 	glibcfix="yes"
 elif [ "${gamename}" == "BrainBread 2" ]; then
 	glibcrequired="2.17"
+elif [ "${gamename}" == "Day of Infamy" ]; then
+	glibcrequired="2.15"
+	glibcfix="yes"
 elif [ "${gamename}" == "Double Action: Boogaloo" ]; then
 	glibcrequired="2.15"
 	glibcfix="yes"
+elif [ "${gamename}" == "Empires Mod" ]; then
+	glibcrequired="2.15"
+	glibcfix="yes"
 elif [ "${gamename}" == "Fistful of Frags" ]; then
 	glibcrequired="2.15"
 	glibcfix="yes"

+ 1 - 1
lgsm/functions/install_config.sh

@@ -247,7 +247,7 @@ elif [ "${gamename}" == "Day of Infamy" ]; then
 	fn_sourceconfig
 elif [ "${gamename}" == "Don't Starve Together" ]; then
 	echo -e "downloading lgsm-default.ini...\c"
-	wget -N /dev/null ${githuburl}/DontStarveTogether/lgsm-default.ini 2>&1 | grep -F HTTP | cut -c45- | uniq
+	wget -N /dev/null ${githuburl}/DontStarveTogether/cfg/lgsm-default.ini 2>&1 | grep -F HTTP | cut -c45- | uniq
 	sleep 1
 	fn_defaultconfig
 elif [ "${gamename}" == "Double Action: Boogaloo" ]; then