Daniel Gibbs 5 лет назад
Родитель
Сommit
6bf2351a77
3 измененных файлов с 10 добавлено и 10 удалено
  1. 2 2
      lgsm/functions/core_dl.sh
  2. 1 1
      lgsm/functions/install_config.sh
  3. 7 7
      lgsm/functions/mods_core.sh

+ 2 - 2
lgsm/functions/core_dl.sh

@@ -377,7 +377,7 @@ fn_fetch_file_github(){
 fn_fetch_config(){
 	github_file_url_dir="${1}"
 	github_file_url_name="${2}"
-		# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
+	# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
 	if [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
 		remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}"
 		remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"
@@ -425,7 +425,7 @@ fn_fetch_function(){
 fn_update_function(){
 	github_file_url_dir="lgsm/functions"
 	github_file_url_name="${functionfile}"
-		# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
+	# If master branch will currently running LinuxGSM version to prevent "version mixing". This is ignored if a fork.
 	if [ "${githubbranch}" == "master" ]&&[ "${githubuser}" == "GameServerManager" ]&&[ "${commandname}" != "UPDATE-LGSM" ]; then
 		remote_fileurl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${version}/${github_file_url_dir}/${github_file_url_name}"
 		remote_fileurl_backup="https://bitbucket.org/${githubuser}/${githubrepo}/raw/${version}/${github_file_url_dir}/${github_file_url_name}"

+ 1 - 1
lgsm/functions/install_config.sh

@@ -576,7 +576,7 @@ elif [ "${shortname}" == "mumble" ]; then
 	fn_fetch_default_config
 	fn_default_config_remote
 	fn_list_config_locations
-elif [ "${gamename}" == "Pavlov VR" ]; then
+elif [ "${shortname}" == "pvr" ]; then
 	gamedirname="PavlovVR"
 	fn_check_cfgdir
 	array_configs+=( Game.ini )

+ 7 - 7
lgsm/functions/mods_core.sh

@@ -609,7 +609,7 @@ fn_mod_install_liblist_gam_file(){
 			exitcode=$?
 			# if replacement back didn't happen, error out.
 			if [ "${exitcode}" != 0 ]; then
-				fn_script_log_fatal ${logentry}
+				fn_script_log_fatal "${logentry}"
 				fn_print_fail_eol_nl
 			else
 				fn_script_log_pass ${logentry}
@@ -633,7 +633,7 @@ fn_mod_remove_liblist_gam_file(){
 		exitcode=$?
 		# if replacement back didn't happen, error out.
 		if [ "${exitcode}" != 0 ]; then
-			fn_script_log_fatal ${logentry}
+			fn_script_log_fatal "${logentry}"
 			fn_print_fail_eol_nl
 		else
 			fn_script_log_pass ${logentry}
@@ -649,7 +649,7 @@ fn_mod_remove_liblist_gam_file(){
 		exitcode=$?
 		# if replacement back didn't happen, error out
 		if [ "${exitcode}" != 0 ]; then
-			fn_script_log_fatal ${logentry}
+			fn_script_log_fatal "${logentry}"
 			fn_print_fail_eol_nl
 		else
 			fn_script_log_pass ${logentry}
@@ -667,7 +667,7 @@ fn_mod_remove_liblist_gam_file(){
 			# if replacement back didn't happen, error out.
 			exitcode=$?
 			if [ "${exitcode}" != 0 ]; then
-				fn_script_log_fatal ${logentry}
+				fn_script_log_fatal "${logentry}"
 				fn_print_fail_eol_nl
 			else
 				fn_script_log_pass ${logentry}
@@ -690,7 +690,7 @@ fn_mod_install_amxmodx_file(){
 			echo "linux addons/amxmodx/dlls/amxmodx_mm_i386.so" >> "${modinstalldir}/addons/metamod/plugins.ini"
 			exitcode=$?
 			if [ "${exitcode}" != 0 ]; then
-				fn_script_log_fatal ${logentry}
+				fn_script_log_fatal "${logentry}"
 				fn_print_fail_eol_nl
 			else
 				fn_script_log_pass ${logentry}
@@ -702,7 +702,7 @@ fn_mod_install_amxmodx_file(){
 		echo "linux addons/amxmodx/dlls/amxmodx_mm_i386.so" > "${modinstalldir}/addons/metamod/plugins.ini"
 		exitcode=$?
 		if [ "${exitcode}" != 0 ]; then
-			fn_script_log_fatal ${logentry}
+			fn_script_log_fatal "${logentry}"
 			fn_print_fail_eol_nl
 			core_exit.sh
 		else
@@ -727,7 +727,7 @@ fn_mod_remove_amxmodx_file(){
 			sed -i '/^$/d' "${modinstalldir}/addons/metamod/plugins.ini"
 			exitcode=$?
 			if [ "${exitcode}" != 0 ]; then
-				fn_script_log_fatal ${logentry}
+				fn_script_log_fatal "${logentry}"
 				fn_print_fail_eol_nl
 			else
 				fn_script_log_pass ${logentry}