Skip to content

Commit 7105f0c

Browse files
committed
[update] : DEFAULT_ARGUMENT as array
1 parent 5d63055 commit 7105f0c

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

build.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,10 +1036,9 @@ make_iso() {
10361036

10371037

10381038
# Parse options
1039-
ARGUMENT=("${@}" ${DEFAULT_ARGUMENT})
10401039
OPTS=("a:" "b" "c:" "d" "e" "g:" "h" "j" "k:" "l:" "o:" "p:" "r" "t:" "u:" "w:" "x")
10411040
OPTL=("arch:" "boot-splash" "comp-type:" "debug" "cleaning" "cleanup" "gpgkey:" "help" "lang:" "japanese" "kernel:" "out:" "password:" "comp-opts:" "user:" "work:" "bash-debug" "nocolor" "noconfirm" "nodepend" "gitversion" "msgdebug" "noloopmod" "tarball" "noiso" "noaur" "nochkver" "channellist" "config:" "noefi" "nodebug" "nosigcheck" "normwork" "log" "logpath:" "nolog" "nopkgbuild" "pacman-debug" "confirm")
1042-
if ! OPT=$(getopt -o "$(printf "%s," "${OPTS[@]}")" -l "$(printf "%s," "${OPTL[@]}")" -- "${ARGUMENT[@]}"); then
1041+
if ! OPT=$(getopt -o "$(printf "%s," "${OPTS[@]}")" -l "$(printf "%s," "${OPTL[@]}")" -- "${@}" "${DEFAULT_ARGUMENT[@]}"); then
10431042
exit 1
10441043
fi
10451044

default.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# !! WARNING !!
2727
# This variable can only be used in default.conf.
2828
# It does not apply even if it is used in the config of each channel.
29-
DEFAULT_ARGUMENT=""
29+
DEFAULT_ARGUMENT=(--nocolor --noloopmod -w '/dir hoge/iso')
3030

3131
#-- archiso --#
3232
# Architecture to build

0 commit comments

Comments
 (0)