From 89e7f6042522ec697dcec2ff2d6f92fe36572c4f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 17 Apr 2022 11:55:28 +0100 Subject: [PATCH] formatting --- lgsm/functions/command_update_linuxgsm.sh | 28 +++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/lgsm/functions/command_update_linuxgsm.sh b/lgsm/functions/command_update_linuxgsm.sh index c45d8a6f50..aa2de3bf2e 100755 --- a/lgsm/functions/command_update_linuxgsm.sh +++ b/lgsm/functions/command_update_linuxgsm.sh @@ -151,31 +151,31 @@ fi echo -en "checking ${remotereponame} config lgsm-template.cfg...\c" fn_script_log_info "Checking ${remotereponame} config lgsm-template.cfg" if [ "${remotereponame}" == "GitHub" ]; then - curl --connect-timeout 10 -IsfL "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/config-default/config-lgsm/lgsm-template.cfg" 1>/dev/null + curl --connect-timeout 10 -IsfL "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/config-default/config-lgsm/lgsm-template.cfg" 1>/dev/null else - curl --connect-timeout 10 -IsfL "https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/lgsm/config-default/config-lgsm/lgsm-template.cfg" 1>/dev/null + curl --connect-timeout 10 -IsfL "https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/lgsm/config-default/config-lgsm/lgsm-template.cfg" 1>/dev/null fi if [ $? != "0" ]; then - fn_print_fail_eol_nl - fn_script_log_fatal "Checking ${remotereponame} config lgsm-template.cfg" - fn_script_log_fatal "Curl returned error: $?" - core_exit.sh + fn_print_fail_eol_nl + fn_script_log_fatal "Checking ${remotereponame} config lgsm-template.cfg" + fn_script_log_fatal "Curl returned error: $?" + core_exit.sh fi if [ "${remotereponame}" == "GitHub" ]; then - config_file_diff=$(diff "${configdirdefault}/config-lgsm/lgsm-template.cfg" <(curl --connect-timeout 10 -s "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/config-default/config-lgsm/lgsm-template.cfg")) + config_file_diff=$(diff "${configdirdefault}/config-lgsm/lgsm-template.cfg" <(curl --connect-timeout 10 -s "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/config-default/config-lgsm/lgsm-template.cfg")) else - config_file_diff=$(diff "${configdirdefault}/config-lgsm/lgsm-template.cfg" <(curl --connect-timeout 10 -s "https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/lgsm/config-default/config-lgsm/lgsm-template.cfg")) + config_file_diff=$(diff "${configdirdefault}/config-lgsm/lgsm-template.cfg" <(curl --connect-timeout 10 -s "https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/lgsm/config-default/config-lgsm/lgsm-template.cfg")) fi if [ "${config_file_diff}" != "" ]; then - fn_print_update_eol_nl - fn_script_log_update "Checking ${remotereponame} config lgsm-template.cfg" - rm -f "${configdirdefault:?}/config-lgsm/lgsm-template.cfg" - fn_fetch_file_github "lgsm/config-default/config-lgsm" "lgsm-template.cfg" "${configdirdefault}/config-lgsm" "nochmodx" "norun" "noforce" "nohash" + fn_print_update_eol_nl + fn_script_log_update "Checking ${remotereponame} config lgsm-template.cfg" + rm -f "${configdirdefault:?}/config-lgsm/lgsm-template.cfg" + fn_fetch_file_github "lgsm/config-default/config-lgsm" "lgsm-template.cfg" "${configdirdefault}/config-lgsm" "nochmodx" "norun" "noforce" "nohash" else - fn_print_ok_eol_nl - fn_script_log_pass "Checking ${remotereponame} config lgsm-template.cfg" + fn_print_ok_eol_nl + fn_script_log_pass "Checking ${remotereponame} config lgsm-template.cfg" fi # Check distro csv. ${datadir}/${distroid}-${distroversioncsv}.csv