diff options
author | Thomas Bächler <thomas@archlinux.org> | 2008-03-16 10:55:51 +0100 |
---|---|---|
committer | Thomas Bächler <thomas@archlinux.org> | 2008-03-16 10:55:51 +0100 |
commit | c98f860009e05b4d3f10b914ade3a5fad1df6b24 (patch) | |
tree | c4f8062d5f52cd41d94bf08c38d2fc2d95c130eb /mkinitcpio | |
parent | 1f8eed5b46629c3e38207349b505251e3c0cde1c (diff) | |
download | mkinitcpio-c98f860009e05b4d3f10b914ade3a5fad1df6b24.tar.gz mkinitcpio-c98f860009e05b4d3f10b914ade3a5fad1df6b24.tar.xz |
Fix various coding style issues
Diffstat (limited to 'mkinitcpio')
-rwxr-xr-x | mkinitcpio | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -74,19 +74,19 @@ trap sighandler TERM INT while getopts ':c:k:s:b:g:a:p:m:vH:LMhS:' arg; do if [ "${OPTARG:0:1}" = "-" ]; then - echo "error: optional argument to '-$arg' begins with a '-'" + echo "error: optional argument to '-${arg}' begins with a '-'" echo " you probably don't want this....aborting." usage fi - case "$arg" in - c) CONFIG="$OPTARG" ;; - k) KERNELVERSION="$OPTARG" ;; - s) SAVELIST="y"; FILELIST="$OPTARG" ;; - b) BASEDIR="$OPTARG" ;; - g) GENIMG="$OPTARG" ;; - a) APPEND="y"; SAVELIST="y"; FILELIST="$OPTARG" ;; - p) PRESET="$OPTARG" ;; - m) MESSAGE="$OPTARG" ;; + case "${arg}" in + c) CONFIG="${OPTARG}" ;; + k) KERNELVERSION="${OPTARG}" ;; + s) SAVELIST="y"; FILELIST="${OPTARG}" ;; + b) BASEDIR="${OPTARG}" ;; + g) GENIMG="${OPTARG}" ;; + a) APPEND="y"; SAVELIST="y"; FILELIST="${OPTARG}" ;; + p) PRESET="${OPTARG}" ;; + m) MESSAGE="${OPTARG}" ;; v) QUIET="n" ;; S) SKIPHOOKS="${OPTARG}" ;; H) source "${INSTDIR}/${OPTARG}"; @@ -103,10 +103,10 @@ while getopts ':c:k:s:b:g:a:p:m:vH:LMhS:' arg; do M) SHOW_AUTOMODS="y" ;; h|?) usage ;; :) echo "${OPTARG} requires a value..."; usage ;; - *) echo "invalid argument '$arg'"; usage ;; + *) echo "invalid argument '${arg}'"; usage ;; esac done -shift $(($OPTIND - 1)) +shift $((${OPTIND} - 1)) # use preset $PRESET if [ -n "${PRESET}" ]; then @@ -225,7 +225,7 @@ echo ":: Begin build" #parse 'global' hook, as defined in ${CONFIG} parse_hook -for hook in $HOOKS; do +for hook in ${HOOKS}; do echo "${SKIPHOOKS}" | grep -qw ${hook} && continue unset MODULES unset BINARIES @@ -269,7 +269,7 @@ if [ "${HAS_MODULES}" == "y" ]; then fi status=0 -if [ -n "$GENIMG" ]; then +if [ -n "${GENIMG}" ]; then echo -n ":: Generating image '${GENIMG}'..." sort -u ${FILELIST} > ${FILELIST}.sorted mv ${FILELIST}.sorted ${FILELIST} @@ -290,5 +290,5 @@ fi cleanup -exit $status +exit ${status} #vim:set ft=sh ts=4 sw=4 noet: |