extern/bat-extras
1
0
Fork 0
mirror of https://github.com/eth-p/bat-extras.git synced 2024-11-07 16:24:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

batwatch: Split hook_help into a lib script

Browse Source
This commit is contained in:
Ethan P 2020-07-06 17:49:29 -07:00
parent 69d9c38326
commit 38f56c1bc7
No known key found for this signature in database
GPG Key ID: 6963FD04F6CF35EA
2 changed files with 63 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/opt_hook_help.sh Normal file
View File

@ -0,0 +1,32 @@
#!/usr/bin/env bash
# -----------------------------------------------------------------------------
# bat-extras | Copyright (C) 2019-2020 eth-p | MIT License
#
# Repository: https://github.com/eth-p/bat-extras
# Issues: https://github.com/eth-p/bat-extras/issues
# -----------------------------------------------------------------------------
# Option parser hook: --help support.
# This will accept -h or --help, which prints the usage information and exits.
hook_help() {
SHIFTOPT_HOOKS+=("__shiftopt_hook__help")
if [[ "$1" == "--no-short" ]]; then
__shiftopt_hook__help() {
if [[ "$OPT" = "--help" ]]; then
show_help
exit 0
fi
return 1
}
else
__shiftopt_hook__help() {
if [[ "$OPT" = "--help" ]] || [[ "$OPT" = "-h" ]]; then
show_help
exit 0
fi
return 1
}
fi
}

40
src/batwatch.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash
# -----------------------------------------------------------------------------
# bat-extras | Copyright (C) 2019 eth-p | MIT License
# bat-extras | Copyright (C) 2019-2020 eth-p | MIT License
#
# Repository: https://github.com/eth-p/bat-extras
# Issues: https://github.com/eth-p/bat-extras/issues
@ -10,6 +10,7 @@ LIB="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd "$(dirname "$(readlink "${BASH_
source "${LIB}/constants.sh"
source "${LIB}/opt.sh"
source "${LIB}/opt_hook_color.sh"
source "${LIB}/opt_hook_help.sh"
source "${LIB}/opt_hook_pager.sh"
source "${LIB}/opt_hook_version.sh"
source "${LIB}/opt_hook_width.sh"
@ -18,26 +19,18 @@ source "${LIB}/pager.sh"
# -----------------------------------------------------------------------------
# Init:
# -----------------------------------------------------------------------------
# Option parser hook: --help support.
# This will accept -h or --help, which prints the usage information and exits.
hook_help() {
SHIFTOPT_HOOKS+=("__shiftopt_hook__help")
__shiftopt_hook__help() {
if [[ "$OPT" = "--help" ]] || [[ "$OPT" = "-h" ]]; then
echo 'Usage: batwatch [--watcher entr|poll][--[no-]clear] <file> [<file> ...]'
exit 0
fi
return 1
}
}
hook_color
hook_pager
hook_version
hook_width
hook_help
# -----------------------------------------------------------------------------
# Help:
# -----------------------------------------------------------------------------
show_help() {
echo 'Usage: batwatch [--watcher entr|poll][--[no-]clear] <file> [<file> ...]'
}
# -----------------------------------------------------------------------------
# Watchers:
# -----------------------------------------------------------------------------
@ -48,7 +41,7 @@ WATCHERS=("entr" "poll")
watcher_entr_watch() {
ENTR_ARGS=()
if [[ "$OPT_CLEAR" = "true" ]]; then
if [[ "$OPT_CLEAR" == "true" ]]; then
ENTR_ARGS+=('-c')
fi
@ -61,7 +54,7 @@ watcher_entr_watch() {
}
watcher_entr_supported() {
command -v entr &>/dev/null
command -v entr &> /dev/null
return $?
}
@ -80,7 +73,7 @@ determine_stat_variant() {
read -r name flags <<< "$variant"
# save the results of the stat command
if read -r ts < <(stat ${flags} "$0" 2>/dev/null); then
if read -r ts < <(stat ${flags} "$0" 2> /dev/null); then
# verify that the value is an epoch timestamp
# before proceeding
@ -115,7 +108,7 @@ watcher_poll_watch() {
if "$modified"; then
modified=false
if [[ "$OPT_CLEAR" = "true" ]]; then
if [[ "$OPT_CLEAR" == "true" ]]; then
clear
fi
@ -192,7 +185,10 @@ while shiftopt; do
case "$OPT" in
# Script options
--watcher) shiftval; OPT_WATCHER="$OPT_VAL" ;;
--watcher)
shiftval
OPT_WATCHER="$OPT_VAL"
;;
--clear) OPT_CLEAR=true ;;
--no-clear) OPT_CLEAR=false ;;
@ -241,12 +237,12 @@ if [[ -z "$OPT_WATCHER" ]]; then
exit 2
fi
else
if ! type "watcher_${OPT_WATCHER}_supported" &>/dev/null; then
if ! type "watcher_${OPT_WATCHER}_supported" &> /dev/null; then
print_error "Unknown watcher: '%s'" "$OPT_WATCHER"
exit 1
fi
if ! "watcher_${OPT_WATCHER}_supported" &>/dev/null; then
if ! "watcher_${OPT_WATCHER}_supported" &> /dev/null; then
print_error "Unsupported watcher: '%s'" "$OPT_WATCHER"
exit 1
fi