dokku/dokku-postgres
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: respect various ways of not wanting 'fancy' output.

Browse Source 
Closes dokku/dokku-daemon#19
Closes dokku/dokku-daemon#22
This commit is contained in:
Jose Diaz-Gonzalez
2018-10-10 23:47:46 -04:00
parent 9fac5a4ad4
commit 30b033ee9d
1 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
help-functions
View File

@@ -32,10 +32,10 @@ fn-help-all() {
FULL_OUTPUT=true FULL_OUTPUT=true
if [[ "$CMD" = "$PLUGIN_COMMAND_PREFIX:help" ]] || [[ "$CMD" == "$PLUGIN_COMMAND_PREFIX" ]] || [[ "$CMD" == "$PLUGIN_COMMAND_PREFIX:default" ]] ; then if [[ "$CMD" = "$PLUGIN_COMMAND_PREFIX:help" ]] || [[ "$CMD" == "$PLUGIN_COMMAND_PREFIX" ]] || [[ "$CMD" == "$PLUGIN_COMMAND_PREFIX:default" ]] ; then
BOLD="$(tput bold)" BOLD="$(fn-help-fancy-tput bold)"
NORMAL="\033[m" NORMAL="$(fn-help-fancy-color "\033[m")"
BLUE="\033[0;34m" BLUE="$(fn-help-fancy-color "\033[0;34m")"
CYAN="\033[1;36m" CYAN="$(fn-help-fancy-color "\033[1;36m")"
if [[ -n "$SUBCOMMAND" ]] && [[ "$SUBCOMMAND" != "--all" ]]; then if [[ -n "$SUBCOMMAND" ]] && [[ "$SUBCOMMAND" != "--all" ]]; then
fn-help-contents-subcommand "$SUBCOMMAND" "$FULL_OUTPUT" fn-help-contents-subcommand "$SUBCOMMAND" "$FULL_OUTPUT"
return "$?" return "$?"
@@ -95,12 +95,12 @@ fn-help-contents-subcommand() {
desc="$(grep desc "$CLEAN_FILE" | head -1)" desc="$(grep desc "$CLEAN_FILE" | head -1)"
eval "$desc" eval "$desc"
BLUE="\033[0;34m" BLUE="$(fn-help-fancy-color "\033[0;34m")"
BOLD="$(tput bold)" BOLD="$(fn-help-fancy-tput bold)"
CYAN="\033[1;36m" CYAN="$(fn-help-fancy-color "\033[1;36m")"
NORMAL="\033[m" NORMAL="$(fn-help-fancy-color "\033[m")"
LIGHT_GRAY="\033[2;37m" LIGHT_GRAY="$(fn-help-fancy-color "\033[2;37m")"
LIGHT_RED="\033[1;31m" LIGHT_RED="$(fn-help-fancy-color "\033[1;31m")"
CMD_OUTPUT="$(echo -e " ${PLUGIN_COMMAND_PREFIX}${cmd_line}, ${LIGHT_GRAY}${desc}${NORMAL}")" CMD_OUTPUT="$(echo -e " ${PLUGIN_COMMAND_PREFIX}${cmd_line}, ${LIGHT_GRAY}${desc}${NORMAL}")"
if [[ "$FULL_OUTPUT" != "true" ]]; then if [[ "$FULL_OUTPUT" != "true" ]]; then
echo "$CMD_OUTPUT" echo "$CMD_OUTPUT"
@@ -139,6 +139,26 @@ fn-help-contents-subcommand() {
return 0 return 0
} }
fn-help-fancy-tput() {
declare desc="A wrapper around tput"
if [[ -z "$DOKKU_NO_COLOR" ]] || [[ "$TERM" = "unknown" ]] || [[ "$TERM" == "dumb" ]]; then
return
fi
tput "$@"
}
fn-help-fancy-color() {
declare desc="A wrapper around colors"
if [[ -z "$DOKKU_NO_COLOR" ]] || [[ "$TERM" = "unknown" ]] || [[ "$TERM" == "dumb" ]]; then
return
fi
echo "$@"
}
fn-help-list-example() { fn-help-list-example() {
# shellcheck disable=SC2034 # shellcheck disable=SC2034
declare desc="return $PLUGIN_COMMAND_PREFIX plugin help content" declare desc="return $PLUGIN_COMMAND_PREFIX plugin help content"
@@ -153,8 +173,8 @@ fn-help-subcommand-args() {
local argline arglist args argpos BLUE NORMAL local argline arglist args argpos BLUE NORMAL
if [[ "$FULL_OUTPUT" == "true" ]]; then if [[ "$FULL_OUTPUT" == "true" ]]; then
BLUE="\033[0;34m" BLUE="$(fn-help-fancy-color "\033[0;34m")"
NORMAL="\033[m" NORMAL="$(fn-help-fancy-color "\033[m")"
fi fi
argline=$(grep declare "$FUNC_FILE" | grep -v "declare desc" | head -1 || true) argline=$(grep declare "$FUNC_FILE" | grep -v "declare desc" | head -1 || true)
arglist=($(echo -e "${argline// /"\n"}" | awk -F= '/=/{print ""$1""}')) arglist=($(echo -e "${argline// /"\n"}" | awk -F= '/=/{print ""$1""}'))
@@ -199,12 +219,12 @@ fn-help-subcommand-example() {
return 0 return 0
fi fi
BOLD="$(tput bold)" BOLD="$(fn-help-fancy-tput bold)"
LAST_LINE="" LAST_LINE=""
LIGHT_GRAY="\033[2;37m" LIGHT_GRAY="$(fn-help-fancy-color "\033[2;37m")"
OTHER_GRAY="\033[7;37m" OTHER_GRAY="$(fn-help-fancy-color "\033[7;37m")"
NEWLINE="" NEWLINE=""
NORMAL="\033[m" NORMAL="$(fn-help-fancy-color "\033[m")"
_fn-help-apply-shell-expansion "$EXAMPLE" | while read -r line; do _fn-help-apply-shell-expansion "$EXAMPLE" | while read -r line; do
line="$(echo "$line" | cut -c 4-)" line="$(echo "$line" | cut -c 4-)"
if [[ "$line" == export* ]] || [[ "$line" == dokku* ]]; then if [[ "$line" == export* ]] || [[ "$line" == dokku* ]]; then
@@ -234,8 +254,8 @@ fn-help-subcommand-list-args() {
return 0 return 0
fi fi
NORMAL="\033[m" NORMAL="$(fn-help-fancy-color "\033[m")"
LIGHT_GRAY="\033[2;37m" LIGHT_GRAY="$(fn-help-fancy-color "\033[2;37m")"
_fn-help-apply-shell-expansion "$FLAGS" | while read -r line; do _fn-help-apply-shell-expansion "$FLAGS" | while read -r line; do
echo -e "$(echo "$line" | cut -d',' -f1),${LIGHT_GRAY}$(echo "$line" | cut -d',' -f2-)${NORMAL}" echo -e "$(echo "$line" | cut -d',' -f1),${LIGHT_GRAY}$(echo "$line" | cut -d',' -f2-)${NORMAL}"
@@ -251,8 +271,8 @@ fn-help-subcommand-list-flags() {
return 0 return 0
fi fi
NORMAL="\033[m" NORMAL="$(fn-help-fancy-color "\033[m")"
LIGHT_GRAY="\033[2;37m" LIGHT_GRAY="$(fn-help-fancy-color "\033[2;37m")"
_fn-help-apply-shell-expansion "$FLAGS" | while read -r line; do _fn-help-apply-shell-expansion "$FLAGS" | while read -r line; do
echo -e "$(echo "$line" | cut -d',' -f1),${LIGHT_GRAY}$(echo "$line" | cut -d',' -f2-)${NORMAL}" echo -e "$(echo "$line" | cut -d',' -f1),${LIGHT_GRAY}$(echo "$line" | cut -d',' -f2-)${NORMAL}"