[arch-projects] [mkinitcpio][PATCH 11/12] mkinitcpio: use simple PEs instead of externals

Dave Reisner d at falconindy.com
Thu Jun 9 16:10:05 EDT 2011


Signed-off-by: Dave Reisner <d at falconindy.com>
---
 mkinitcpio |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mkinitcpio b/mkinitcpio
index c40fb2d..5c62868 100755
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -41,7 +41,7 @@ fi
 # works around undetected problems like in #8448
 PATH="${PATH}:/sbin:/usr/sbin"
 
-APPNAME=$(basename "${0}")
+APPNAME=${0##*/}
 
 usage ()
 {
@@ -107,7 +107,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 ;;
@@ -212,8 +212,8 @@ if [ ! -f "${CONFIG}" ]; then
 fi
 . "${CONFIG}"
 
-BASEDIR=$(echo ${BASEDIR} | tr -s /)
-MODULEDIR=$(echo ${MODULEDIR} | tr -s /)
+BASEDIR=${BASEDIR//+(\/)//}
+MODULEDIR=${MODULEDIR//+(\/)//}
 
 . "${FUNCTIONS}"
 
-- 
1.7.5.4



More information about the arch-projects mailing list