From 912f9a2f2816bc44864ba6cd98a1e9ed18bea08d Mon Sep 17 00:00:00 2001 From: hayao Date: Wed, 5 May 2021 22:28:53 +0900 Subject: [PATCH] [update] : Use array to getopt --- dmc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dmc b/dmc index 394bb44..90b28a4 100755 --- a/dmc +++ b/dmc @@ -1664,11 +1664,10 @@ NO_CHECK_TARGET=false REMOVE_FILES=false #== 引数解析 ==# -ARGUMENT="${*}" -OPTS="m:e:hG" -OPTL="mode:,editor:,help,non-interactive,noroot,write-all-files,no-check-target,lightdm-greeter,remove" -# shellcheck disable=SC2086 -if ! OPT="$(getopt -o ${OPTS} -l ${OPTL} -- ${ARGUMENT})"; then +ARGUMENT=("${@}") +OPTS=("m:" "e:" "h" "G") +OPTL=("mode:" "editor:" "help" "non-interactive" "noroot" "write-all-files" "no-check-target" "lightdm-greeter" "remove") +if ! OPT=$(getopt -o "$(printf "%s," "${OPTS[@]}")" -l "$(printf "%s," "${OPTL[@]}")" -- "${ARGUMENT[@]}"); then exit 1 fi -- 2.11.0