[update] : bash syntax

Author: Hayao0819

Makefile

@@ -20,49 +20,32 @@ basic-64 basic-32  cinnamon-64 cinnamon-32 gnome-64 i3-64 i3-32 lxde-64 lxde-32
 	@make clean
 
 menuconfig/build/mconf::
-	@if [ -d menuconfig/build ];\
-	then \
-		:;\
-	else \
-		mkdir menuconfig/build ;\
-	fi
+	@mkdir -p menuconfig/build
 	(cd menuconfig/build ; cmake -GNinja .. ; ninja -j4 )
 
 mkalteriso:
-	@if [ -d system/cpp-src/mkalteriso/build ];\
-	then \
-		:;\
-	else \
-		mkdir system/cpp-src/mkalteriso/build ;\
-	fi
-	(cd system/cpp-src/mkalteriso/build ; cmake -GNinja .. ; ninja -j4 ; cp -f mkalteriso ../../../)
+	@mkdir -p system/cpp-src/mkalteriso/build
+	@(cd system/cpp-src/mkalteriso/build ; cmake -GNinja .. ; ninja -j4 ; cp -f mkalteriso ../../../)
 
 menuconfig:menuconfig/build/mconf menuconfig-script/kernel_choice
-	menuconfig/build/mconf menuconfig-script/rootconf
+	@menuconfig/build/mconf menuconfig-script/rootconf
 
 menuconfig-script/kernel_choice:system/kernel-x86_64 system/kernel-i686
-	${CURRENT_DIR}/tools/kernel-choice-conf-gen.sh
+	@${CURRENT_DIR}/tools/kernel-choice-conf-gen.sh
 
 build_option:
-	if [ -f .config ];\
-	then \
-		:;\
-	else \
-		make menuconfig ;\
-	fi
+	@if [ ! -f .config ]; then make menuconfig ; fi
 	${CURRENT_DIR}/tools/menuconf-to-alterconf.sh ${CURRENT_DIR}/.build_option
 
 clean:
 	@sudo ${CURRENT_DIR}/${BUILD_SCRIPT} clean
 
 build:build_option mkalteriso
 	$(eval BUILD_OPTION := $(shell cat ${CURRENT_DIR}/.build_option))
-	sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${BUILD_OPTION}
+	@sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${BUILD_OPTION}
 
 keyring::
-	sudo ${CURRENT_DIR}/tools/keyring.sh --alter-add --arch-add
+	@sudo ${CURRENT_DIR}/tools/keyring.sh --alter-add --arch-add
 
 wizard:
-	sudo ${CURRENT_DIR}/tools/wizard.sh
-
-
+	@sudo ${CURRENT_DIR}/tools/wizard.sh

build.sh

@@ -1036,10 +1036,11 @@ make_iso() {
 
 # Parse options
 ARGUMENT="${@}"
-opt_short="a:bc:deg:hjk:l:o:p:rt:u:w:x"
-opt_long="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,shmkalteriso,msgdebug,noloopmod,tarball,noiso,noaur,nochkver,channellist,config:,noefi,nodebug,nosigcheck"
-OPT=$(getopt -o ${opt_short} -l ${opt_long} -- ${DEFAULT_ARGUMENT} ${ARGUMENT})
-[[ ${?} != 0 ]] && exit 1
+OPT_S="a:bc:deg:hjk:l:o:p:rt:u:w:x"
+OPT_L="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,shmkalteriso,msgdebug,noloopmod,tarball,noiso,noaur,nochkver,channellist,config:,noefi,nodebug,nosigcheck"
+if ! OPT=$(getopt -o ${OPT_S} -l ${OPT_L} -- ${DEFAULT_ARGUMENT} ${ARGUMENT}); then
+    exit 1
+fi
 
 eval set -- "${OPT}"
 msg_debug "Argument: ${OPT}"

tools/pkglist.sh

@@ -65,8 +65,9 @@ msg_debug() {
 ARGUMENT="${@}"
 opt_short="a:bc:dek:l:mh"
 opt_long="arch:,boot-splash,channel:,debug,extra,kernel:,locale:,memtest86,aur,help,line"
-OPT=$(getopt -o ${opt_short} -l ${opt_long} -- ${ARGUMENT})
-[[ ${?} != 0 ]] && exit 1
+if ! OPT=$(getopt -o ${opt_short} -l ${opt_long} -- ${ARGUMENT}); then
+    exit 1
+fi
 
 eval set -- "${OPT}"
 unset OPT opt_short opt_long