From d41dd0665fcb8d7d5aaadfcfe60a9ff635fe89ec Mon Sep 17 00:00:00 2001 From: Danny Bautista Date: Fri, 7 Jun 2019 13:46:37 -0400 Subject: [PATCH] Add check_arg to sync-ebooks. --- scripts/sync-ebooks | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/sync-ebooks b/scripts/sync-ebooks index f83c6bf7..b1d7b39e 100755 --- a/scripts/sync-ebooks +++ b/scripts/sync-ebooks @@ -24,6 +24,12 @@ EOF } die(){ printf "\033[0;7;31mError:\033[0m %s\n" "${1}" 1>&2; exit 1; } require(){ command -v "$1" > /dev/null 2>&1 || { suggestion=""; if [ -n "$2" ]; then suggestion=" $2"; fi; die "$1 is not installed.${suggestion}"; } } + +check_arg() { + case "$2" in + ''|$1) die "$3" ;; + esac +} # End boilerplate require "git" "Try: apt-get install git" @@ -56,16 +62,12 @@ while [ $# -gt 0 ]; do shift 1 ;; --verbosity) - case "$2" in - ''|*[!0-9]*) die "Verbosity is not an integer." ;; - esac + check_arg '*[!0-9]*' "$2" "Verbosity is not a positive integer." verbosity="$2" shift 2 ;; --token) - case "$2" in - ''|*[!0-9a-zA-Z]*) die "Token is empty or contains illegal characters." ;; - esac + check_arg '*[!0-9a-zA-Z]*' "$2" "Token is empty or contains illegal characters." githubToken="$2" shift 2 ;;