Daniel Gibbs 9 лет назад
Родитель
Сommit
f6a5338767
1 измененных файлов с 8 добавлено и 6 удалено
  1. 8 6
      lgsm/functions/command_update_linuxgsm.sh

+ 8 - 6
lgsm/functions/command_update_linuxgsm.sh

@@ -24,21 +24,23 @@ if [ "${config_file_diff}" != "" ]; then
 	fn_fetch_config "lgsm/config-default/config-lgsm/${servername}" "_default.cfg" "${configdirdefault}/config-lgsm/${servername}" "_default.cfg" "noexecutecmd" "norun" "noforce" "nomd5"
 else
 	fn_print_ok_eol_nl
+	fn_script_log_info "checking config _default.cfg: OK"
 fi
 
 echo -ne "    checking linuxgsm.sh...\c"
-tmp_script_diff=$(diff "${tmpdir}/linuxgsm.sh" <(${curlpath} -s "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/linuxgsm.sh"))
+tmp_script_diff=$(diff "${functionsdir}/linuxgsm.sh" <(${curlpath} -s "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/linuxgsm.sh"))
 if [ "${tmp_script_diff}" != "" ]; then
 	fn_print_update_eol_nl
-	fn_script_log_info "checking ${selfname}: UPDATE"
-	rm -f "${tmpdir}/linuxgsm.sh"
+	fn_script_log_info "checking linuxgsm.sh: UPDATE"
+	rm -f "${functionsdir}/linuxgsm.sh"
 	fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "nochmodx" "norun" "noforcedl" "nomd5"
 	# Compare selfname against linuxgsm.sh in the tmp dir. Ignoring server specific vars.
 else
+	fn_script_log_info "checking linuxgsm.sh: OK"
 	fn_print_ok_eol_nl
 fi
 echo -ne "    checking ${selfname}...\c"
-script_diff=$(diff <(sed '/shortname/d;/servername/d;/gamename/d' "${tmpdir}/linuxgsm.sh") <(sed '/shortname/d;/servername/d;/gamename/d' "${rootdir}/${selfname}"))
+script_diff=$(diff <(sed '/shortname/d;/servername/d;/gamename/d' "${functionsdir}/linuxgsm.sh") <(sed '/shortname/d;/servername/d;/gamename/d' "${rootdir}/${selfname}"))
 if [ "${script_diff}" != "" ]; then
 	fn_print_update_eol_nl
 	echo -ne "    backup ${selfname}...\c"
@@ -50,8 +52,8 @@ if [ "${script_diff}" != "" ]; then
 		fn_print_ok_eol_nl
 		echo -e "	Backup: ${tmpdir}/${selfname}-$(date +"%m_%d_%Y_%M").bak"
 	fi
-	echo -ne "    fetch ${selfname}...\c"
-	cp "${tmpdir}/linuxgsm.sh" "${rootdir}/${selfname}"
+	echo -ne "    fetching ${selfname}...\c"
+	cp "${functionsdir}/linuxgsm.sh" "${rootdir}/${selfname}"
 	sed -i "s/shortname=\"core\"/shortname=\"${shortname}\"/g" "${rootdir}/${selfname}"
 	sed -i "s/servername=\"core\"/servername=\"${servername}\"/g" "${rootdir}/${selfname}"
 	sed -i "s/gamename=\"core\"/gamename=\"${gamename}\"/g" "${rootdir}/${selfname}"