Ability to show sqn_ alias in sequencer help
outColor accepts a custom color number (0-255)
This commit is contained in:
@@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
VERSION_REV=14
|
VERSION_REV=14
|
||||||
VERSION_MAJOR=0
|
VERSION_MAJOR=0
|
||||||
VERSION_MINOR=1
|
VERSION_MINOR=2
|
||||||
|
|
||||||
## Start of generic script part
|
## Start of generic script part
|
||||||
|
|
||||||
@@ -60,8 +60,10 @@ SAVE_POS= ;[ -t 1 ] && SAVE_POS='\033[3D\033[s\033[3C'
|
|||||||
RESTORE_POS= ;[ -t 1 ] && RESTORE_POS='\033[u'
|
RESTORE_POS= ;[ -t 1 ] && RESTORE_POS='\033[u'
|
||||||
|
|
||||||
helpSequencer() {
|
helpSequencer() {
|
||||||
|
local scriptName=${0##*/}
|
||||||
|
[ ! -z "$_SQN_ALIAS" ] && scriptName="$_SQN_ALIAS"
|
||||||
cat <<USAGE_EOF
|
cat <<USAGE_EOF
|
||||||
Usage: ${0##*/} [OPTIONS] [STEP NUMBER(s) or ALIAS] [STEP ARGUMENTS]
|
Usage: $scriptName [OPTIONS] [STEP NUMBER(s) or ALIAS] [STEP ARGUMENTS]
|
||||||
|
|
||||||
[OPTIONS]
|
[OPTIONS]
|
||||||
--all, -a : Run all steps regardless of continuity
|
--all, -a : Run all steps regardless of continuity
|
||||||
@@ -276,6 +278,7 @@ echoerr() { outColor red; >&2 echo "$@"; outColor none; }
|
|||||||
# outColor <FOREGROUND COLOR> [BACKGROUND COLOR]
|
# outColor <FOREGROUND COLOR> [BACKGROUND COLOR]
|
||||||
outColor() {
|
outColor() {
|
||||||
[ ! -t 1 ] && return 0
|
[ ! -t 1 ] && return 0
|
||||||
|
[ -z "$1" ] && tput sgr0 && return 0
|
||||||
case "$1" in
|
case "$1" in
|
||||||
black)
|
black)
|
||||||
tput setaf 0;;
|
tput setaf 0;;
|
||||||
@@ -294,8 +297,7 @@ outColor() {
|
|||||||
white)
|
white)
|
||||||
tput setaf 7;;
|
tput setaf 7;;
|
||||||
*)
|
*)
|
||||||
tput sgr0
|
tput setaf $1;;
|
||||||
return;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
case "$2" in
|
case "$2" in
|
||||||
@@ -510,8 +512,7 @@ initSeqConfig() {
|
|||||||
# Create config subdir in users home
|
# Create config subdir in users home
|
||||||
if [ ! -e "$configDir/" ] ; then
|
if [ ! -e "$configDir/" ] ; then
|
||||||
echoseq -n " [I] Creating $(realpath $configDir)..."
|
echoseq -n " [I] Creating $(realpath $configDir)..."
|
||||||
exe mkdir -p "$configDir" && echoseq "Ok" || echoseq "Nok"
|
exe install -m 700 -d "$configDir" && echoseq "Ok" || echoseq "Nok"
|
||||||
exe chmod 700 "$configDir"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SEQ_CONFIG_HOME="$configDir"
|
SEQ_CONFIG_HOME="$configDir"
|
||||||
@@ -538,9 +539,8 @@ initSeqConfig() {
|
|||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exe cp -ar "$configTemplate" "$configLoc"
|
exe install -m 600 -T "$configTemplate" "$configLoc"
|
||||||
endReturn -o $? "Failed to create configuration"
|
endReturn -o $? "Failed to create configuration"
|
||||||
exe chmod 600 "$configLoc"
|
|
||||||
|
|
||||||
if [ $sourceAlways -eq 0 ] ; then
|
if [ $sourceAlways -eq 0 ] ; then
|
||||||
if [ $SEQ_CONFIG_EDIT -eq 0 ] ; then
|
if [ $SEQ_CONFIG_EDIT -eq 0 ] ; then
|
||||||
|
@@ -5,14 +5,27 @@ _sqnall_completions()
|
|||||||
# Current search string
|
# Current search string
|
||||||
local cur=${COMP_WORDS[COMP_CWORD]}
|
local cur=${COMP_WORDS[COMP_CWORD]}
|
||||||
# Extract alias command with buildins same as:
|
# Extract alias command with buildins same as:
|
||||||
# local curCmd="$(alias $1 | sed "s/^alias.*='\(.*\)'$/\1/")"
|
# local curCmd="$(alias $1 | sed "s/^alias.*\" \(.*\)'$/\1/")"
|
||||||
local curCmd="$(alias "$1")"
|
local curCmd="$(alias "$1")"
|
||||||
curCmd="${curCmd#*=\'}"
|
curCmd="${curCmd##*\" }"
|
||||||
curCmd="${curCmd%\'*}"
|
curCmd="${curCmd%\'*}"
|
||||||
COMPREPLY=()
|
COMPREPLY=()
|
||||||
case "$cur" in
|
case "$cur" in
|
||||||
-*)
|
-*)
|
||||||
COMPREPLY=( $( compgen -W '-c -d -h -ha -ls -p -pl -q -qq -s -v --version' -- $cur ) );;
|
COMPREPLY=( $( compgen -W '\
|
||||||
|
-a --all \
|
||||||
|
-c --config \
|
||||||
|
-d --dry-run \
|
||||||
|
-h --help \
|
||||||
|
-ha --helpapi \
|
||||||
|
-ls --liststeps \
|
||||||
|
-p --profile \
|
||||||
|
-pl \
|
||||||
|
-q --quiet \
|
||||||
|
-qq \
|
||||||
|
-s --single \
|
||||||
|
-v --verbose \
|
||||||
|
--version' -- $cur ) );;
|
||||||
*)
|
*)
|
||||||
# Stop after step selection (last argument which is not an option; starting with "-")
|
# Stop after step selection (last argument which is not an option; starting with "-")
|
||||||
(( COMP_CWORD > 1 )) && [[ ! "${COMP_WORDS[((COMP_CWORD - 1))]}" =~ ^- ]] && return
|
(( COMP_CWORD > 1 )) && [[ ! "${COMP_WORDS[((COMP_CWORD - 1))]}" =~ ^- ]] && return
|
||||||
@@ -32,7 +45,7 @@ installCompletion() {
|
|||||||
SEQLIST[$i]="${SEQLIST[$i]##*/}"
|
SEQLIST[$i]="${SEQLIST[$i]##*/}"
|
||||||
SEQLIST[$i]="${SEQLIST[$i]%.*}"
|
SEQLIST[$i]="${SEQLIST[$i]%.*}"
|
||||||
SEQSHORT[$i]="${SEQPREFIX}${SEQLIST[$i]}"
|
SEQSHORT[$i]="${SEQPREFIX}${SEQLIST[$i]}"
|
||||||
alias ${SEQSHORT[$i]}="$SEQBASE/${SEQLIST[$i]}.sh"
|
alias ${SEQSHORT[$i]}="_SQN_ALIAS=\"${SEQSHORT[$i]}\" $SEQBASE/${SEQLIST[$i]}.sh"
|
||||||
done
|
done
|
||||||
complete -o nosort -o bashdefault -o default -F _sqnall_completions ${SEQSHORT[@]}
|
complete -o nosort -o bashdefault -o default -F _sqnall_completions ${SEQSHORT[@]}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user