Mirrored_Repos/psu
1
0
Fork 0
mirror of https://gitlab.com/psuapp/psu.git synced 2024-08-30 18:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename err function to echo_error

Browse Source
This commit is contained in:
Juan Carlos Mejías Rodríguez 2018-11-25 22:06:03 -05:00
parent 76caefc30b
commit 4ca1ab72c6
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
psu
View File

@ -36,7 +36,7 @@ main() {
d) DEBUG_MODE="true" ;; d) DEBUG_MODE="true" ;;
t) STRICT_MODE="true" ;; t) STRICT_MODE="true" ;;
*) *)
err "Unexpected option ${option}" echo_error "Unexpected option ${option}"
exit 1 exit 1
;; ;;
esac esac
@ -106,7 +106,7 @@ main() {
exit 0 exit 0
fi fi
err "Error: Unknown action \"$ACTION\"." echo_error "Error: Unknown action \"$ACTION\"."
exit 1 exit 1
} }
@ -119,7 +119,7 @@ main() {
# Returns: # # Returns: #
# None # # None #
############################ ############################
err() { echo_error() {
local error_message=$@ local error_message=$@
echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $error_message" >&2 echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $error_message" >&2
} }
@ -142,8 +142,8 @@ check_argument() {
local argument_envvar=$3 local argument_envvar=$3
local argument_flag=$4 local argument_flag=$4
if [ -z "$argument_value" ]; then if [ -z "$argument_value" ]; then
err "Error: Missing argument \"$argument_name\"." echo_error "Error: Missing argument \"$argument_name\"."
err "Try setting \"$argument_envvar\" environment variable or using the \"-$argument_flag\" flag." echo_error "Try setting \"$argument_envvar\" environment variable or using the \"-$argument_flag\" flag."
exit 1 exit 1
fi fi
} }
@ -163,12 +163,12 @@ check_for_errors() {
local response=$2 local response=$2
if [ $exit_code -ne 0 ]; then if [ $exit_code -ne 0 ]; then
case $exit_code in case $exit_code in
2) err 'Request timed out!' ;; 2) echo_error 'Request timed out!' ;;
3) err 'Unexpected HTTP 3xx Redirection!' ;; 3) echo_error 'Unexpected HTTP 3xx Redirection!' ;;
4) err 'HTTP 4xx Client Error!' && err $response ;; 4) echo_error 'HTTP 4xx Client Error!' && echo_error $response ;;
5) err 'HTTP 5xx Server Error!' && err $response ;; 5) echo_error 'HTTP 5xx Server Error!' && echo_error $response ;;
6) err 'Exceeded --max-redirects=<n> redirects!' ;; 6) echo_error 'Exceeded --max-redirects=<n> redirects!' ;;
*) err 'Unholy Error!' ;; *) echo_error 'Unholy Error!' ;;
esac esac
exit 1 exit 1
fi fi
@ -306,7 +306,7 @@ deploy() {
rm json.tmp rm json.tmp
else else
if [ $STRICT_MODE == "true" ]; then if [ $STRICT_MODE == "true" ]; then
err "Error: Stack $PORTAINER_STACK_NAME already exists." echo_error "Error: Stack $PORTAINER_STACK_NAME already exists."
exit 1 exit 1
fi fi
echo_verbose "Stack $PORTAINER_STACK_NAME exists." echo_verbose "Stack $PORTAINER_STACK_NAME exists."
@ -352,7 +352,7 @@ deploy() {
undeploy() { undeploy() {
if [ -z "$STACK" ]; then if [ -z "$STACK" ]; then
if [ $STRICT_MODE == "true" ]; then if [ $STRICT_MODE == "true" ]; then
err "Error: Stack $PORTAINER_STACK_NAME does not exist." echo_error "Error: Stack $PORTAINER_STACK_NAME does not exist."
exit 1 exit 1
else else
echo_verbose "Stack $PORTAINER_STACK_NAME does not exist. No need to undeploy it." echo_verbose "Stack $PORTAINER_STACK_NAME does not exist. No need to undeploy it."