Browse Source

fixes

pull/914/head
Daniel Gibbs 9 years ago
parent
commit
52c2a1a46d
  1. 18
      lgsm/functions/command_update_functions.sh

18
lgsm/functions/command_update_functions.sh

@ -36,16 +36,18 @@ if [ -n "${functionsdir}" ]; then
for functionfile in * for functionfile in *
do do
echo -ne " checking ${functionfile}...\c" 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}" 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 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}" ${curlcmd} -s --fail "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${functionfile}"
local exitcode=$? local exitcode=$?
if [ "${exitcode}" != "0" ]; then if [ "${exitcode}" != "0" ]; then
echo -ne " checking ${functionfile}...\c" echo -ne " checking ${functionfile}...\c"
fn_print_fail_eol_nl fn_print_fail_eol_nl
rm -rfv "${functionsdir}/${functionfile}" rm -rfv "${functionsdir}/${functionfile}"
exitcode=2
else else
echo -ne " checking ${functionfile}...UPDATE" echo -ne " checking ${functionfile}...UPDATE"
rm -rfv "${functionsdir}/${functionfile}" rm -rfv "${functionsdir}/${functionfile}"
@ -53,20 +55,20 @@ if [ -n "${functionsdir}" ]; then
fi fi
else else
echo -ne " checking ${functionfile}...\c" echo -ne " checking ${functionfile}...\c"
fn_print_fail_eol_nl fn_print_ok_eol_nl
fi fi
done done
fi fi
fi fi
if [ "${exitcode}" == "0" ]; then if [ "${exitcode}" != "0" ]; then
fn_print_ok "Updating functions"
fn_script_log_pass "Success! Updating functions"
exitcode=0
else
fn_print_fail "Updating functions" fn_print_fail "Updating functions"
fn_script_log_fatal "Failure! Updating functions" fn_script_log_fatal "Failure! Updating functions"
exitcode=1 exitcode=1
else
fn_print_ok "Updating functions"
fn_script_log_pass "Success! Updating functions"
exitcode=0
fi fi
echo -ne "\n" echo -ne "\n"
core_exit.sh core_exit.sh
Loading…
Cancel
Save