From 52c2a1a46dba8e966fdd37d3ffae9e6c8dcb9c20 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 2 Jul 2016 20:18:52 +0100 Subject: [PATCH] fixes --- lgsm/functions/command_update_functions.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lgsm/functions/command_update_functions.sh b/lgsm/functions/command_update_functions.sh index ec6c709e0..ba4f7d170 100644 --- a/lgsm/functions/command_update_functions.sh +++ b/lgsm/functions/command_update_functions.sh @@ -36,16 +36,18 @@ if [ -n "${functionsdir}" ]; then for functionfile in * do echo -ne " checking ${functionfile}...\c" - function_file_diff=$(diff "${functionsdir}/${functionfile}" <(${curlcmd} -s "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${functionfile}")) echo "${curlcmd} -s --fail https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${functionfile}" + + function_file_diff=$(diff "${functionsdir}/${functionfile}" <(${curlcmd} -s "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${functionfile}")) if [ "${function_file_diff}" != "" ]; then - echo "${curlcmd} -s --fail https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${functionfile}" + echo "files are different!!" ${curlcmd} -s --fail "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${functionfile}" local exitcode=$? if [ "${exitcode}" != "0" ]; then echo -ne " checking ${functionfile}...\c" fn_print_fail_eol_nl rm -rfv "${functionsdir}/${functionfile}" + exitcode=2 else echo -ne " checking ${functionfile}...UPDATE" rm -rfv "${functionsdir}/${functionfile}" @@ -53,20 +55,20 @@ if [ -n "${functionsdir}" ]; then fi else echo -ne " checking ${functionfile}...\c" - fn_print_fail_eol_nl + fn_print_ok_eol_nl fi done fi fi -if [ "${exitcode}" == "0" ]; then - fn_print_ok "Updating functions" - fn_script_log_pass "Success! Updating functions" - exitcode=0 -else +if [ "${exitcode}" != "0" ]; then fn_print_fail "Updating functions" fn_script_log_fatal "Failure! Updating functions" exitcode=1 +else + fn_print_ok "Updating functions" + fn_script_log_pass "Success! Updating functions" + exitcode=0 fi echo -ne "\n" core_exit.sh \ No newline at end of file