From 507e4bec82e3cc40c6bc3488b0bdf387acdfc49e Mon Sep 17 00:00:00 2001 From: Noah Gorny Date: Sun, 21 Jun 2020 16:03:18 +0300 Subject: [PATCH] Convert files with spaces and tabs to only spaces --- completion/available/salt.completion.bash | 116 +++++----- .../available/virtualbox.completion.bash | 208 +++++++++--------- themes/parrot/parrot.theme.bash | 4 +- 3 files changed, 164 insertions(+), 164 deletions(-) diff --git a/completion/available/salt.completion.bash b/completion/available/salt.completion.bash index 7634dcdc..de493af9 100644 --- a/completion/available/salt.completion.bash +++ b/completion/available/salt.completion.bash @@ -35,10 +35,10 @@ _salt(){ cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" if [ ${COMP_CWORD} -gt 2 ]; then - pprev="${COMP_WORDS[COMP_CWORD-2]}" + pprev="${COMP_WORDS[COMP_CWORD-2]}" fi if [ ${COMP_CWORD} -gt 3 ]; then - ppprev="${COMP_WORDS[COMP_CWORD-3]}" + ppprev="${COMP_WORDS[COMP_CWORD-3]}" fi opts="-h --help -d --doc --documentation --version --versions-report -c \ @@ -96,7 +96,7 @@ _salt(){ -G|--grain|--grain-pcre) COMPREPLY=($(compgen -W "$(_salt_get_grains)" -- ${cur})) return 0 - ;; + ;; -C|--compound) COMPREPLY=() # TODO: finish this one? how? return 0 @@ -110,7 +110,7 @@ _salt(){ return 0 ;; -N|--nodegroup) - MASTER_CONFIG='/etc/salt/master' + MASTER_CONFIG='/etc/salt/master' COMPREPLY=($(compgen -W "`awk -F ':' 'BEGIN {print_line = 0}; /^nodegroups/ {print_line = 1;getline } print_line && /^ */ {print $1} /^[^ ]/ {print_line = 0}' <${MASTER_CONFIG}`" -- ${cur})) return 0 ;; @@ -193,7 +193,7 @@ _saltkey(){ return 0 ;; --accept-all) - return 0 + return 0 ;; esac COMPREPLY=($(compgen -W "${opts} " -- ${cur})) @@ -230,21 +230,21 @@ _saltcall(){ fi case ${prev} in - -m|--module-dirs) - COMPREPLY=( $(compgen -d ${cur} )) - return 0 - ;; - -l|--log-level) - COMPREPLY=( $(compgen -W "info none garbage trace warning error debug" -- ${cur})) - return 0 - ;; - -g|grains) - return 0 - ;; - salt-call) - COMPREPLY=($(compgen -W "${opts}" -- ${cur})) - return 0 - ;; + -m|--module-dirs) + COMPREPLY=( $(compgen -d ${cur} )) + return 0 + ;; + -l|--log-level) + COMPREPLY=( $(compgen -W "info none garbage trace warning error debug" -- ${cur})) + return 0 + ;; + -g|grains) + return 0 + ;; + salt-call) + COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + return 0 + ;; esac _salt_coms="$(salt-call --out=txt -- sys.list_functions|sed 's/^.*\[//' | tr -d ",']" )" @@ -279,46 +279,46 @@ _saltcp(){ fi case ${prev} in - salt-cp) - COMPREPLY=($(compgen -W "${opts} `salt-key -l acc --no-color`" -- ${cur})) - return 0 - ;; - -t|--timeout) - # those numbers are just a hint - COMPREPLY=($(compgen -W "2 3 4 8 10 15 20 25 30 40 60 90 120 180 240 300" -- ${cur} )) - return 0 - ;; - -E|--pcre) - COMPREPLY=($(compgen -W "`salt-key -l acc --no-color`" -- ${cur})) - return 0 - ;; - -L|--list) - # IMPROVEMENTS ARE WELCOME - prefpart="${cur%,*}," - postpart=${cur##*,} - filt="^\($(echo ${cur}| sed 's:,:\\|:g')\)$" + salt-cp) + COMPREPLY=($(compgen -W "${opts} `salt-key -l acc --no-color`" -- ${cur})) + return 0 + ;; + -t|--timeout) + # those numbers are just a hint + COMPREPLY=($(compgen -W "2 3 4 8 10 15 20 25 30 40 60 90 120 180 240 300" -- ${cur} )) + return 0 + ;; + -E|--pcre) + COMPREPLY=($(compgen -W "`salt-key -l acc --no-color`" -- ${cur})) + return 0 + ;; + -L|--list) + # IMPROVEMENTS ARE WELCOME + prefpart="${cur%,*}," + postpart=${cur##*,} + filt="^\($(echo ${cur}| sed 's:,:\\|:g')\)$" helper=($(salt-key -l acc --no-color | grep -v "${filt}" | sed "s/^/${prefpart}/")) - COMPREPLY=($(compgen -W "${helper[*]}" -- ${cur})) + COMPREPLY=($(compgen -W "${helper[*]}" -- ${cur})) - return 0 - ;; - -G|--grain|--grain-pcre) - COMPREPLY=($(compgen -W "$(_salt_get_grains)" -- ${cur})) - return 0 - ;; - # FIXME - -R|--range) - # FIXME ?? - return 0 - ;; - -C|--compound) - # FIXME ?? - return 0 - ;; - -c|--config) - COMPREPLY=($(compgen -f -- ${cur})) - return 0 - ;; + return 0 + ;; + -G|--grain|--grain-pcre) + COMPREPLY=($(compgen -W "$(_salt_get_grains)" -- ${cur})) + return 0 + ;; + # FIXME + -R|--range) + # FIXME ?? + return 0 + ;; + -C|--compound) + # FIXME ?? + return 0 + ;; + -c|--config) + COMPREPLY=($(compgen -f -- ${cur})) + return 0 + ;; esac # default is using opts: diff --git a/completion/available/virtualbox.completion.bash b/completion/available/virtualbox.completion.bash index d0d41df2..3c29437f 100644 --- a/completion/available/virtualbox.completion.bash +++ b/completion/available/virtualbox.completion.bash @@ -10,13 +10,13 @@ __vboxmanage_startvm() { AVAILABLE="" for VM in $TOTAL; do - MATCH=0; - for RUN in $RUNNING "x"; do - if [ "$VM" == "$RUN" ]; then - MATCH=1 - fi - done - (( $MATCH == 0 )) && AVAILABLE="$AVAILABLE $VM " + MATCH=0; + for RUN in $RUNNING "x"; do + if [ "$VM" == "$RUN" ]; then + MATCH=1 + fi + done + (( $MATCH == 0 )) && AVAILABLE="$AVAILABLE $VM " done echo $AVAILABLE } @@ -26,14 +26,14 @@ __vboxmanage_list() { PRUNED="" if [ "$1" == "long" ]; then - for WORD in $INPUT; do - [ "$WORD" == "-l" ] && continue; - [ "$WORD" == "--long" ] && continue; + for WORD in $INPUT; do + [ "$WORD" == "-l" ] && continue; + [ "$WORD" == "--long" ] && continue; - PRUNED="$PRUNED $WORD" - done + PRUNED="$PRUNED $WORD" + done else - PRUNED=$INPUT + PRUNED=$INPUT fi echo $PRUNED @@ -43,14 +43,14 @@ __vboxmanage_list() { __vboxmanage_list_vms() { VMS="" if [ "x$1" == "x" ]; then - SEPARATOR=" " + SEPARATOR=" " else - SEPARATOR=$1 + SEPARATOR=$1 fi for VM in $(vboxmanage list vms | cut -d' ' -f1 | tr -d '"'); do - [ "$VMS" != "" ] && VMS="${VMS}${SEPARATOR}" - VMS="${VMS}${VM}" + [ "$VMS" != "" ] && VMS="${VMS}${SEPARATOR}" + VMS="${VMS}${VM}" done echo $VMS @@ -59,14 +59,14 @@ __vboxmanage_list_vms() { __vboxmanage_list_runningvms() { VMS="" if [ "$1" == "" ]; then - SEPARATOR=" " + SEPARATOR=" " else - SEPARATOR=$1 + SEPARATOR=$1 fi for VM in $(vboxmanage list runningvms | cut -d' ' -f1 | tr -d '"'); do - [ "$VMS" != "" ] && VMS="${VMS}${SEPARATOR}" - VMS="${VMS}${VM}" + [ "$VMS" != "" ] && VMS="${VMS}${SEPARATOR}" + VMS="${VMS}${VM}" done echo $VMS @@ -102,40 +102,40 @@ __vboxmanage_default() { # echo "DEBUG: cur: $cur, prev: $prev" # echo "DEBUG: default: |$p1|$p2|$p3|$p4|" case ${cur} in - -*) - echo $opts - # COMPREPLY=($(compgen -W "${opts}" -- ${cur})) - return 0 - ;; + -*) + echo $opts + # COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + return 0 + ;; esac; for WORD in $opts; do - MATCH=0 - for OPT in "${COMP_WORDS[@]}"; do - # opts=$(echo ${opts} | grep -v $OPT); - if [ "$OPT" == "$WORD" ]; then - MATCH=1 - break; - fi - if [ "$OPT" == "-v" ] && [ "$WORD" == "--version" ]; then - MATCH=1 - break; - fi - if [ "$OPT" == "--version" ] && [ "$WORD" == "-v" ]; then - MATCH=1 - break; - fi - if [ "$OPT" == "-q" ] && [ "$WORD" == "--nologo" ]; then - MATCH=1 - break; - fi - if [ "$OPT" == "--nologo" ] && [ "$WORD" == "-q" ]; then - MATCH=1 - break; - fi - done - (( $MATCH == 1 )) && continue; - pruned="$pruned $WORD" + MATCH=0 + for OPT in "${COMP_WORDS[@]}"; do + # opts=$(echo ${opts} | grep -v $OPT); + if [ "$OPT" == "$WORD" ]; then + MATCH=1 + break; + fi + if [ "$OPT" == "-v" ] && [ "$WORD" == "--version" ]; then + MATCH=1 + break; + fi + if [ "$OPT" == "--version" ] && [ "$WORD" == "-v" ]; then + MATCH=1 + break; + fi + if [ "$OPT" == "-q" ] && [ "$WORD" == "--nologo" ]; then + MATCH=1 + break; + fi + if [ "$OPT" == "--nologo" ] && [ "$WORD" == "-q" ]; then + MATCH=1 + break; + fi + done + (( $MATCH == 1 )) && continue; + pruned="$pruned $WORD" done @@ -156,65 +156,65 @@ _vboxmanage() { # In case current is complete command case $cur in - startvm|list|controlvm) - COMPREPLY=($(compgen -W "$cur ")) - return 0 - ;; + startvm|list|controlvm) + COMPREPLY=($(compgen -W "$cur ")) + return 0 + ;; esac case $prev in - -v|--version) - return 0 - ;; + -v|--version) + return 0 + ;; - -l|--long) - opts=$(__vboxmanage_list "long") - COMPREPLY=($(compgen -W "${opts}" -- ${cur})) - return 0 - ;; - startvm|list) - opts=$(__vboxmanage_$prev) - COMPREPLY=($(compgen -W "${opts}" -- ${cur})) - return 0 - ;; - --type) - COMPREPLY=($(compgen -W "gui headless" -- ${cur})) - return 0 - ;; - gui|headless) - # Done. no more completion possible - return 0 - ;; - vboxmanage|-q|--nologo) - # echo "Got vboxmanage" - opts=$(__vboxmanage_default) - COMPREPLY=($(compgen -W "${opts}" -- ${cur})) - return 0 - ;; - controlvm) - opts=$(__vboxmanage_list_vms) - COMPREPLY=($(compgen -W "${opts}" -- ${cur})) - return 0 - ;; + -l|--long) + opts=$(__vboxmanage_list "long") + COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + return 0 + ;; + startvm|list) + opts=$(__vboxmanage_$prev) + COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + return 0 + ;; + --type) + COMPREPLY=($(compgen -W "gui headless" -- ${cur})) + return 0 + ;; + gui|headless) + # Done. no more completion possible + return 0 + ;; + vboxmanage|-q|--nologo) + # echo "Got vboxmanage" + opts=$(__vboxmanage_default) + COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + return 0 + ;; + controlvm) + opts=$(__vboxmanage_list_vms) + COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + return 0 + ;; esac for VM in $(__vboxmanage_list_vms); do - if [ "$VM" == "$prev" ]; then - pprev=${COMP_WORDS[COMP_CWORD-2]} - # echo "previous: $pprev" - case $pprev in - startvm) - opts="--type" - COMPREPLY=($(compgen -W "${opts}" -- ${cur})) - return 0 - ;; - controlvm) - opts=$(__vboxmanage_controlvm) - COMPREPLY=($(compgen -W "${opts}" -- ${cur})) - return 0; - ;; - esac - fi + if [ "$VM" == "$prev" ]; then + pprev=${COMP_WORDS[COMP_CWORD-2]} + # echo "previous: $pprev" + case $pprev in + startvm) + opts="--type" + COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + return 0 + ;; + controlvm) + opts=$(__vboxmanage_controlvm) + COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + return 0; + ;; + esac + fi done # echo "Got to end withoug completion" diff --git a/themes/parrot/parrot.theme.bash b/themes/parrot/parrot.theme.bash index 815aa952..a0d259dd 100644 --- a/themes/parrot/parrot.theme.bash +++ b/themes/parrot/parrot.theme.bash @@ -20,9 +20,9 @@ function prompt() { # We have color support; assume it's compliant with Ecma-48 # (ISO/IEC-6429). (Lack of such support is extremely rare, and such # a case would tend to support setf rather than setaf.) - local color_prompt=yes + local color_prompt=yes else - local color_prompt= + local color_prompt= fi fi