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