refactor function defs to be posix-like. remove usage of force positional argument in tests. support --force like arguments in client"

This commit is contained in:
Michael Hobbs
2015-02-07 10:57:30 -08:00
parent c4ef29173c
commit 959c51eb50
6 changed files with 37 additions and 22 deletions

View File

@@ -40,7 +40,7 @@ if [[ ! -f "$FILENAME" ]] ; then
echo " CHECKS file found in container"
FILENAME=${TMPDIR}/CHECKS
function cleanup() {
cleanup() {
echo " removing CHECKS file copied from container"
rm -rf $TMPDIR
}

View File

@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
function has_tty() {
has_tty() {
if [[ "$(/usr/bin/tty || true)" == "not a tty" ]]; then
return 1
else
@@ -9,15 +9,15 @@ function has_tty() {
fi
}
function dokku_log_info1() {
dokku_log_info1() {
echo "-----> $@"
}
function dokku_log_info2() {
dokku_log_info2() {
echo "=====> $@"
}
function dokku_log_info1_quiet() {
dokku_log_info1_quiet() {
if [[ -z "$DOKKU_QUIET_OUTPUT" ]];then
echo "-----> $@"
else
@@ -25,7 +25,7 @@ function dokku_log_info1_quiet() {
fi
}
function dokku_log_info2_quiet() {
dokku_log_info2_quiet() {
if [[ -z "$DOKKU_QUIET_OUTPUT" ]];then
echo "=====> $@"
else
@@ -33,26 +33,26 @@ function dokku_log_info2_quiet() {
fi
}
function dokku_log_verbose() {
dokku_log_verbose() {
echo " $@"
}
function dokku_log_warn() {
dokku_log_warn() {
echo " ! $@"
}
function dokku_log_fail() {
dokku_log_fail() {
echo "$@" 1>&2
exit 1
}
function verify_app_name() {
verify_app_name() {
local APP="$1"
[[ ! -d "$DOKKU_ROOT/$APP" ]] && dokku_log_fail "App $APP does not exist"
return 0
}
function parse_args() {
parse_args() {
for arg in "$@"; do
case "$arg" in
--quiet|-q)