Further improvements

lgsm/functions/command_update_functions.sh

@@ -34,26 +34,26 @@ if [ "${tmp_script_diff}" != "" ]; then
 	rm -f "${tmpdir}/linuxgsm.sh"
 	fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "linuxgsm.sh" "noexecutecmd" "norun" "noforce" "nomd5"
 	# Compare selfname against linuxgsm.sh in the tmp dir. Ignoring server specific vars.
-	script_diff=$(diff <(sed '/shortname/d;/servername/d;/gamename/d' "${tmpdir}/linuxgsm.sh") <(sed '/shortname/d;/servername/d;/gamename/d' "${rootdir}/${selfname}"))
+fi
-	if [ "${script_diff}" != "" ]; then
+script_diff=$(diff <(sed '/shortname/d;/servername/d;/gamename/d' "${tmpdir}/linuxgsm.sh") <(sed '/shortname/d;/servername/d;/gamename/d' "${rootdir}/${selfname}"))
-		echo -ne "    backup linuxgsm.sh...\c"
+if [ "${script_diff}" != "" ]; then
-		cp "${rootdir}/${selfname}" "${tmpdir}/${selfname}-$(date +"%m_%d_%Y_%M").bak"
+	echo -ne "    backup linuxgsm.sh...\c"
-		if [ $? -ne 0 ]; then
+	cp "${rootdir}/${selfname}" "${tmpdir}/${selfname}-$(date +"%m_%d_%Y_%M").bak"
-			fn_print_fail_eol_nl
+	if [ $? -ne 0 ]; then
-			core_exit.sh
+		fn_print_fail_eol_nl
-		else
+		core_exit.sh
-			fn_print_ok_eol_nl
+	else
-			echo -en "${tmpdir}/${selfname}-$(date +"%m_%d_%Y_%M").bak"
+		fn_print_ok_eol_nl
-		fi
+		echo -en "${tmpdir}/${selfname}-$(date +"%m_%d_%Y_%M").bak"
-		copyshortname="$(grep -m 1 shortname=)" "${rootdir}/${selfname}"
-		copyservername="$(grep -m 1 servername=)" "${rootdir}/${selfname}"
-		copygamename="$(grep -m 1 gamename=)" "${rootdir}/${selfname}"
-
-		cp "${tmpdir}/linuxgsm.sh" "${rootdir}/${selfname}"
-		sed -i 's/shortname="core"/${copyshortname}/g' "${rootdir}/${selfname}"
-		sed -i 's/shortname="core"/${copyshortname}/g' "${rootdir}/${selfname}"
-		sed -i 's/shortname="core"/${copyshortname}/g' "${rootdir}/${selfname}"
 	fi
+	copyshortname="$(grep -m 1 shortname= "${rootdir}/${selfname}")"
+	copyservername="$(grep -m 1 servername= "${rootdir}/${selfname}")"
+	copygamename="$(grep -m 1 gamename= "${rootdir}/${selfname}")"
+
+	cp "${tmpdir}/linuxgsm.sh" "${rootdir}/${selfname}"
+	sed -i 's/shortname="core"/${copyshortname}/g' "${rootdir}/${selfname}"
+	sed -i 's/shortname="core"/${copyshortname}/g' "${rootdir}/${selfname}"
+	sed -i 's/shortname="core"/${copyshortname}/g' "${rootdir}/${selfname}"
 else
 	fn_print_ok_eol_nl
 fi