From 67f4919ffefdc2a95af95e86cc01b998df292b4b Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 26 Sep 2023 01:34:10 +0100 Subject: simplify getopts loops in shell scripts Signed-off-by: Leah Rowe --- script/handle/make/config | 26 +++++++------------------- script/handle/make/file | 13 ++++--------- script/update/blobs/inject | 11 ++++------- 3 files changed, 15 insertions(+), 35 deletions(-) diff --git a/script/handle/make/config b/script/handle/make/config index 81169953..9ae85a0e 100755 --- a/script/handle/make/config +++ b/script/handle/make/config @@ -38,26 +38,14 @@ main() while getopts b:m:u:c:x: option do case "${1}" in - -b) - mode="all" - shift ;; - -u) - mode="oldconfig" - shift ;; - -m) - mode="menuconfig" - shift ;; - -c) - mode="distclean" - shift ;; - -x) - mode="crossgcc-clean" - shift ;; - *) - fail "Invalid option" ;; + -b) mode="all" ;; + -u) mode="oldconfig" ;; + -m) mode="menuconfig" ;; + -c) mode="distclean" ;; + -x) mode="crossgcc-clean" ;; + *) fail "Invalid option" ;; esac - project="${OPTARG}" - shift + shift; project="${OPTARG}"; shift done [ -z "${mode}" ] && fail "mode not given (-m, -u or -b)" diff --git a/script/handle/make/file b/script/handle/make/file index 3d485ea2..0d0d6f3c 100755 --- a/script/handle/make/file +++ b/script/handle/make/file @@ -15,16 +15,11 @@ main() while getopts b:c: option do case "${1}" in - -b) - shift ;; - -c) - mode="distclean" - shift ;; - *) - err "Invalid option" ;; + -b) : ;; + -c) mode="distclean" ;; + *) err "Invalid option" ;; esac - project="${OPTARG}" - shift + shift; project="${OPTARG}"; shift done [ -z "${project}" ] && err "project name not specified" diff --git a/script/update/blobs/inject b/script/update/blobs/inject index aae7b0cc..c2f9ead6 100755 --- a/script/update/blobs/inject +++ b/script/update/blobs/inject @@ -23,13 +23,10 @@ main() while getopts r:b:m: option do case "${option}" in - r) - rom=${OPTARG} ;; - b) - board=${OPTARG} ;; - m) - modifygbe=true - new_mac=${OPTARG} ;; + r) rom=${OPTARG} ;; + b) board=${OPTARG} ;; + m) modifygbe=true + new_mac=${OPTARG} ;; esac done -- cgit v1.2.1