From c178ddde535dddce27fb230cdd1f501f8eb3ba9b Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Mon, 6 Jun 2011 01:19:26 -0400 Subject: mkinitcpio: use simple PEs instead of externals Signed-off-by: Dave Reisner --- mkinitcpio | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mkinitcpio b/mkinitcpio index 853cf03..897ce1d 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -44,7 +44,7 @@ PATH="${PATH}:/sbin:/usr/sbin" # GREP_OPTIONS="--color=always" will break everything unset GREP_OPTIONS -APPNAME=$(basename "${0}") +APPNAME=${0##*/} usage () { @@ -110,7 +110,7 @@ while getopts ':c:k:sb:g:p:m:vH:LMhS:' arg; do exit 0 ;; L) echo "Available hooks: " for h in ${INSTDIR}/*; do - echo " $(basename ${h})" + echo " ${h##*/}" done cleanup exit 0 ;; @@ -215,8 +215,8 @@ if [ ! -f "${CONFIG}" ]; then fi . "${CONFIG}" -BASEDIR=$(echo ${BASEDIR} | tr -s /) -MODULEDIR=$(echo ${MODULEDIR} | tr -s /) +BASEDIR=${BASEDIR//+(\/)//} +MODULEDIR=${MODULEDIR//+(\/)//} . "${FUNCTIONS}" -- cgit v1.2.3-24-g4f1b