diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-05-12 19:23:16 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-05-12 19:23:16 -0400 |
commit | 272f57b2a4d9f2c8d5ac3c46962f25c55dfbb270 (patch) | |
tree | 90055d8d7e394ae5377200ee2ec00afa4b861f0b /jh.sh | |
parent | b2c326dc625c0ee7cdfb5763b036db6893db9efd (diff) |
simplify by moving usage() into jh-help, jh no longer needs to be included
Diffstat (limited to 'jh.sh')
-rw-r--r-- | jh.sh | 41 |
1 files changed, 12 insertions, 29 deletions
@@ -1,45 +1,28 @@ #!/bin/bash -if [[ -z "$jh_cmd" ]]; then - export jh_cmd=$0 -fi -export jh_short=${jh_cmd##*/} - -if [[ -z "$JH_PATH" ]]; then +if [[ -z $JH_PATH ]]; then export JH_PATH=/usr/share/jh fi -usage() { - cmd="${1-$0}" - cmd="${cmd##*/jh-}" - file="$JH_PATH/jh-$cmd.help.txt" - if [[ -z "$cmd" ]]; then - echo "Usage: $jh_short <command> [command-specific-arguments]" - echo "Java helper for PKGBUILDs" - echo "" - "$jh_short" list-commands|sed 's/./ &/' - elif [[ -f "$JH_PATH/jh-$cmd.help.txt" ]]; then - sed "s|@cmd@|$jh_short|g" "$file" >> /dev/stderr - else - echo "$jh_short: Cannot find help file for '$cmd'" >> /dev/stderr - fi -} +if [[ -z $jh_short ]]; then + export jh_short=${0##*/} + export PATH="$JH_PATH:$PATH" +fi -run() { +main() { if [[ $# < 1 ]]; then - usage '' - exit 1; + jh-help >>/dev/stderr + return 1; fi cmd=$1 shift - file="$JH_PATH/jh-$cmd" - if [[ -x "$file" ]]; then - "$file" "$@" - exit $? + if [[ -x "$(which "jh-$cmd" 2>/dev/null)" ]]; then + "jh-$cmd" "$@" + return $? else echo "$jh_short: Cannot find command '$cmd'" >> /dev/stderr fi } -[[ "$jh_cmd" == "$0" ]] && run "$@" +main "$@" |