Update localcopy.sh, shellcheck'ed and shfmt'ed

This commit is contained in:
invario 2025-05-31 14:54:44 -04:00 committed by GitHub
parent 9ef3e128c6
commit ce80fcd116
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -42,46 +42,42 @@ localcopy_deploy() {
if [ "$DEPLOY_LOCALCOPY_CERTIFICATE" ]; then if [ "$DEPLOY_LOCALCOPY_CERTIFICATE" ]; then
_info "Copying certificate" _info "Copying certificate"
_debug "Copying $_ccert to $DEPLOY_LOCALCOPY_CERTIFICATE" _debug "Copying $_ccert to $DEPLOY_LOCALCOPY_CERTIFICATE"
eval "cp $_ccert $DEPLOY_LOCALCOPY_CERTIFICATE" if ! eval "cp $_ccert $DEPLOY_LOCALCOPY_CERTIFICATE"; then
if [ $? -ne 0 ]; then
_err "Failed to copy certificate, aborting." _err "Failed to copy certificate, aborting."
return 1; return 1
fi; fi
_savedeployconf DEPLOY_LOCALCOPY_CERTIFICATE "$DEPLOY_LOCALCOPY_CERTIFICATE" _savedeployconf DEPLOY_LOCALCOPY_CERTIFICATE "$DEPLOY_LOCALCOPY_CERTIFICATE"
fi; fi
if [ "$DEPLOY_LOCALCOPY_CERTKEY" ]; then if [ "$DEPLOY_LOCALCOPY_CERTKEY" ]; then
_info "Copying certificate key" _info "Copying certificate key"
_debug "Copying $_ckey to $DEPLOY_LOCALCOPY_CERTKEY" _debug "Copying $_ckey to $DEPLOY_LOCALCOPY_CERTKEY"
eval "cp $_ckey $DEPLOY_LOCALCOPY_CERTKEY" if ! eval "cp $_ckey $DEPLOY_LOCALCOPY_CERTKEY"; then
if [ $? -ne 0 ]; then
_err "Failed to copy certificate key, aborting." _err "Failed to copy certificate key, aborting."
return 1; return 1
fi; fi
_savedeployconf DEPLOY_LOCALCOPY_CERTKEY "$DEPLOY_LOCALCOPY_CERTKEY" _savedeployconf DEPLOY_LOCALCOPY_CERTKEY "$DEPLOY_LOCALCOPY_CERTKEY"
fi; fi
if [ "$DEPLOY_LOCALCOPY_FULLCHAIN" ]; then if [ "$DEPLOY_LOCALCOPY_FULLCHAIN" ]; then
_info "Copying fullchain" _info "Copying fullchain"
_debug "Copying $_cfullchain to $DEPLOY_LOCALCOPY_FULLCHAIN" _debug "Copying $_cfullchain to $DEPLOY_LOCALCOPY_FULLCHAIN"
eval "cp $_cfullchain $DEPLOY_LOCALCOPY_FULLCHAIN" if ! eval "cp $_cfullchain $DEPLOY_LOCALCOPY_FULLCHAIN"; then
if [ $? -ne 0 ]; then
_err "Failed to copy fullchain, aborting." _err "Failed to copy fullchain, aborting."
return 1; return 1
fi; fi
_savedeployconf DEPLOY_LOCALCOPY_FULLCHAIN "$DEPLOY_LOCALCOPY_FULLCHAIN" _savedeployconf DEPLOY_LOCALCOPY_FULLCHAIN "$DEPLOY_LOCALCOPY_FULLCHAIN"
fi; fi
if [ "$DEPLOY_LOCALCOPY_CA" ]; then if [ "$DEPLOY_LOCALCOPY_CA" ]; then
_info "Copying CA" _info "Copying CA"
_debug "Copying $_cca to $DEPLOY_LOCALCOPY_CA" _debug "Copying $_cca to $DEPLOY_LOCALCOPY_CA"
eval "cp $_cca $DEPLOY_LOCALCOPY_CA" if ! eval "cp $_cca $DEPLOY_LOCALCOPY_CA"; then
if [ $? -ne 0 ]; then
_err "Failed to copy CA, aborting." _err "Failed to copy CA, aborting."
return 1; return 1
fi; fi
_savedeployconf DEPLOY_LOCALCOPY_CA "$DEPLOY_LOCALCOPY_CA" _savedeployconf DEPLOY_LOCALCOPY_CA "$DEPLOY_LOCALCOPY_CA"
fi; fi
_reload=$DEPLOY_LOCALCOPY_RELOADCMD _reload=$DEPLOY_LOCALCOPY_RELOADCMD
_debug "Running reloadcmd $_reload" _debug "Running reloadcmd $_reload"
@ -90,16 +86,15 @@ localcopy_deploy() {
_info "Reloadcmd not provided, skipping." _info "Reloadcmd not provided, skipping."
else else
_info "Reloading" _info "Reloading"
if eval $_reload; then if eval "$_reload"; then
_info "Reload successful." _info "Reload successful."
_savedeployconf DEPLOY_LOCALCOPY_RELOADCMD "$DEPLOY_LOCALCOPY_RELOADCMD" "base64" _savedeployconf DEPLOY_LOCALCOPY_RELOADCMD "$DEPLOY_LOCALCOPY_RELOADCMD" "base64"
else else
_err "Reload failed." _err "Reload failed."
return 1; return 1
fi; fi
fi; fi
_info "$(__green "'localcopy' deploy success")" _info "$(__green "'localcopy' deploy success")"
return 0 return 0
} }