From 9213944091302d6f9bc08101f98647d750241c93 Mon Sep 17 00:00:00 2001 From: Chris Greenshields Date: Wed, 31 May 2017 19:28:28 +0100 Subject: [PATCH] Bash [TAB] completion: enabled for scripts in wmake/ dir --- etc/config.sh/bash_completion | 294 ++++++++++++++++++++++++++++++++++ wmake/wcleanPlatform | 8 +- wmake/wmakeSchedulerUptime | 23 ++- wmake/wrmdep | 2 - 4 files changed, 321 insertions(+), 6 deletions(-) diff --git a/etc/config.sh/bash_completion b/etc/config.sh/bash_completion index 11b3c4d39..6d338d35d 100644 --- a/etc/config.sh/bash_completion +++ b/etc/config.sh/bash_completion @@ -6282,4 +6282,298 @@ _wdot_ () } complete -o nospace -F _wdot_ wdot +_wclean_ () +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + local prev="${COMP_WORDS[COMP_CWORD-1]}" + local line=${COMP_LINE} + local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") + + opts="-help -silent" + for o in $used ; do opts="${opts/$o/}" ; done + extra="" + + [ "$COMP_CWORD" = 1 ] || \ + case "$prev" in + *) ;; + esac + COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) +} +complete -o nospace -F _wclean_ wclean + +_wcleanLnIncludeAll_ () +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + local prev="${COMP_WORDS[COMP_CWORD-1]}" + local line=${COMP_LINE} + local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") + + opts="" + for o in $used ; do opts="${opts/$o/}" ; done + extra="" + + [ "$COMP_CWORD" = 1 ] || \ + case "$prev" in + *) ;; + esac + COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) +} +complete -o nospace -F _wcleanLnIncludeAll_ wcleanLnIncludeAll + +_wcleanPlatform_ () +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + local prev="${COMP_WORDS[COMP_CWORD-1]}" + local line=${COMP_LINE} + local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") + + opts="-all -current -help" + for o in $used ; do opts="${opts/$o/}" ; done + extra="" + + [ "$COMP_CWORD" = 1 ] || \ + case "$prev" in + *) ;; + esac + COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) +} +complete -o nospace -F _wcleanPlatform_ wcleanPlatform + +_wdep_ () +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + local prev="${COMP_WORDS[COMP_CWORD-1]}" + local line=${COMP_LINE} + local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") + + opts="-help" + for o in $used ; do opts="${opts/$o/}" ; done + extra="-d -f" + + [ "$COMP_CWORD" = 1 ] || \ + case "$prev" in + -*) ;; + *) + opts=""; extra="" + ;; + esac + COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) +} +complete -o nospace -F _wdep_ wdep + +_wmake_ () +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + local prev="${COMP_WORDS[COMP_CWORD-1]}" + local line=${COMP_LINE} + local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") + + opts="-all -help -j -j -non-stop -no-scheduler -queue -silent -update" + for o in $used ; do opts="${opts/$o/}" ; done + extra="" + + [ "$COMP_CWORD" = 1 ] || \ + case "$prev" in + -j) + opts="" ; extra="" ;; + *) ;; + esac + COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) +} +complete -o nospace -F _wmake_ wmake + +_wmakeCheckPwd_ () +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + local prev="${COMP_WORDS[COMP_CWORD-1]}" + local line=${COMP_LINE} + local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") + + opts="-help -quiet" + for o in $used ; do opts="${opts/$o/}" ; done + extra="" + + [ "$COMP_CWORD" = 1 ] || \ + case "$prev" in + *) ;; + esac + COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) +} +complete -o nospace -F _wmakeCheckPwd_ wmakeCheckPwd + +_wmakeCollect_ () +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + local prev="${COMP_WORDS[COMP_CWORD-1]}" + local line=${COMP_LINE} + local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") + + opts="-clean -help -kill" + for o in $used ; do opts="${opts/$o/}" ; done + extra="" + + [ "$COMP_CWORD" = 1 ] || \ + case "$prev" in + *) ;; + esac + COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) +} +complete -o nospace -F _wmakeCollect_ wmakeCollect + +_wmakeFilesAndOptions_ () +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + local prev="${COMP_WORDS[COMP_CWORD-1]}" + local line=${COMP_LINE} + local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") + + opts="-help" + for o in $used ; do opts="${opts/$o/}" ; done + extra="" + + [ "$COMP_CWORD" = 1 ] || \ + case "$prev" in + *) ;; + esac + COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) +} +complete -o nospace -F _wmakeFilesAndOptions_ wmakeFilesAndOptions + +_wmakeLnInclude_ () +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + local prev="${COMP_WORDS[COMP_CWORD-1]}" + local line=${COMP_LINE} + local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") + + opts="-help -silent -update" + for o in $used ; do opts="${opts/$o/}" ; done + extra="" + + [ "$COMP_CWORD" = 1 ] || \ + case "$prev" in + *) ;; + esac + COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) +} +complete -o nospace -F _wmakeLnInclude_ wmakeLnInclude + +_wmakeLnIncludeAll_ () +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + local prev="${COMP_WORDS[COMP_CWORD-1]}" + local line=${COMP_LINE} + local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") + + opts="-help -j -j" + for o in $used ; do opts="${opts/$o/}" ; done + extra="" + + [ "$COMP_CWORD" = 1 ] || \ + case "$prev" in + -j) + opts="" ; extra="" ;; + *) ;; + esac + COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) +} +complete -o nospace -F _wmakeLnIncludeAll_ wmakeLnIncludeAll + +_wmakePrintBuild_ () +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + local prev="${COMP_WORDS[COMP_CWORD-1]}" + local line=${COMP_LINE} + local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") + + opts="-check -help -major -pkg -short -update -version" + for o in $used ; do opts="${opts/$o/}" ; done + extra="" + + [ "$COMP_CWORD" = 1 ] || \ + case "$prev" in + -pkg|-version) + opts="" ; extra="" ;; + *) ;; + esac + COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) +} +complete -o nospace -F _wmakePrintBuild_ wmakePrintBuild + +_wmakeScheduler_ () +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + local prev="${COMP_WORDS[COMP_CWORD-1]}" + local line=${COMP_LINE} + local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") + + opts="" + for o in $used ; do opts="${opts/$o/}" ; done + extra="" + + [ "$COMP_CWORD" = 1 ] || \ + case "$prev" in + *) ;; + esac + COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) +} +complete -o nospace -F _wmakeScheduler_ wmakeScheduler + +_wmakeSchedulerUptime_ () +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + local prev="${COMP_WORDS[COMP_CWORD-1]}" + local line=${COMP_LINE} + local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") + + opts="-help" + for o in $used ; do opts="${opts/$o/}" ; done + extra="" + + [ "$COMP_CWORD" = 1 ] || \ + case "$prev" in + *) ;; + esac + COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) +} +complete -o nospace -F _wmakeSchedulerUptime_ wmakeSchedulerUptime + +_wrmdep_ () +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + local prev="${COMP_WORDS[COMP_CWORD-1]}" + local line=${COMP_LINE} + local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") + + opts="" + for o in $used ; do opts="${opts/$o/}" ; done + extra="" + + [ "$COMP_CWORD" = 1 ] || \ + case "$prev" in + *) ;; + esac + COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) +} +complete -o nospace -F _wrmdep_ wrmdep + +_wrmo_ () +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + local prev="${COMP_WORDS[COMP_CWORD-1]}" + local line=${COMP_LINE} + local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") + + opts="-all -help" + for o in $used ; do opts="${opts/$o/}" ; done + extra="" + + [ "$COMP_CWORD" = 1 ] || \ + case "$prev" in + *) ;; + esac + COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) +} +complete -o nospace -F _wrmo_ wrmo + #------------------------------------------------------------------------------ diff --git a/wmake/wcleanPlatform b/wmake/wcleanPlatform index d3e1f0238..fe473a93d 100755 --- a/wmake/wcleanPlatform +++ b/wmake/wcleanPlatform @@ -57,8 +57,12 @@ error() { usage() { cat< [ ... ] +options: + -all all platforms + -current current platform + -help print the usage Deletes the specified platforms object files directories from the the project top-level platforms directory $WM_PROJECT_DIR. @@ -76,7 +80,7 @@ USAGE # Print help message if [ "$1" = "-h" -o "$1" = "-help" ]; then - usage + usage && exit 0 fi # Check the script is executed from the project top-level directory diff --git a/wmake/wmakeSchedulerUptime b/wmake/wmakeSchedulerUptime index 6239f9e65..2fb71d488 100755 --- a/wmake/wmakeSchedulerUptime +++ b/wmake/wmakeSchedulerUptime @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | -# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------- # License @@ -50,6 +50,22 @@ #------------------------------------------------------------------------------- Script=${0##*/} +usage() { + cat <&2 + while [ "$#" -ge 1 ]; do echo "$1"; shift; done + usage + exit 1 +} + # csh sets HOST, bash sets HOSTNAME : ${HOST:=$HOSTNAME} @@ -173,13 +189,16 @@ nprocs=1 while [ "$#" -gt 0 ] do case "$1" in + -help | -h) + usage && exit 0 + ;; -np) shift nprocs=$1 shift ;; -*) - usage "unknown option: '$*'" + error "unknown option: '$*'" ;; *) break diff --git a/wmake/wrmdep b/wmake/wrmdep index 802fb063e..668b83db0 100755 --- a/wmake/wrmdep +++ b/wmake/wrmdep @@ -57,8 +57,6 @@ Script=${0##*/} . ${0%/*}/scripts/wmakeFunctions usage() { - exec 1>&2 - while [ "$#" -ge 1 ]; do echo "$1"; shift; done cat<