Skip to content

Commit 329fffc

Browse files
committed
Optimize the handling of custom input parameters
1 parent e647bc7 commit 329fffc

File tree

1 file changed

+18
-11
lines changed

1 file changed

+18
-11
lines changed

remake

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -179,30 +179,33 @@ init_var() {
179179
echo -e "${STEPS} Start Initializing Variables..."
180180

181181
# If it is followed by [ : ], it means that the option requires a parameter value
182-
get_all_ver="$(getopt "b:r:u:k:a:s:n:" "${@}")"
182+
local options="b:r:u:k:a:s:n:"
183+
parsed_args=$(getopt -o "${options}" -- "${@}")
184+
[[ ${?} -ne 0 ]] && error_msg "Parameter parsing failed."
185+
eval set -- "${parsed_args}"
183186

184-
while [[ -n "${1}" ]]; do
187+
while true; do
185188
case "${1}" in
186189
-b | --Board)
187190
if [[ -n "${2}" ]]; then
188191
make_board="${2// /}"
189-
shift
192+
shift 2
190193
else
191194
error_msg "Invalid -b parameter [ ${2} ]!"
192195
fi
193196
;;
194197
-r | --kernelRepository)
195198
if [[ -n "${2}" ]]; then
196199
kernel_repo="${2}"
197-
shift
200+
shift 2
198201
else
199202
error_msg "Invalid -r parameter [ ${2} ]!"
200203
fi
201204
;;
202205
-u | --kernelUsage)
203206
if [[ -n "${2}" ]]; then
204207
kernel_usage="${2//kernel_/}"
205-
shift
208+
shift 2
206209
else
207210
error_msg "Invalid -u parameter [ ${2} ]!"
208211
fi
@@ -217,40 +220,44 @@ init_var() {
217220
beta_kernel=(${2})
218221
specific_kernel=(${2})
219222
IFS="${oldIFS}"
220-
shift
223+
shift 2
221224
else
222225
error_msg "Invalid -k parameter [ ${2} ]!"
223226
fi
224227
;;
225228
-a | --Autokernel)
226229
if [[ -n "${2}" ]]; then
227230
auto_kernel="${2}"
228-
shift
231+
shift 2
229232
else
230233
error_msg "Invalid -a parameter [ ${2} ]!"
231234
fi
232235
;;
233236
-s | --Size)
234237
if [[ -n "${2}" ]]; then
235238
img_mb="${2}"
236-
shift
239+
shift 2
237240
else
238241
error_msg "Invalid -s parameter [ ${2} ]!"
239242
fi
240243
;;
241244
-n | --BuilderName)
242245
if [[ -n "${2}" ]]; then
243246
builder_name="${2// /}"
244-
shift
247+
shift 2
245248
else
246249
error_msg "Invalid -n parameter [ ${2} ]!"
247250
fi
248251
;;
252+
--)
253+
shift
254+
break
255+
;;
249256
*)
250-
error_msg "Invalid option [ ${1} ]!"
257+
[[ -n "${1}" ]] && error_msg "Invalid option [ ${1} ]!"
258+
break
251259
;;
252260
esac
253-
shift
254261
done
255262

256263
# Set the image size, such as [ -s 512/2560 ] or [ -s 2560 ]

0 commit comments

Comments
 (0)