summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <d@falconindy.com>2011-06-06 07:19:26 +0200
committerDave Reisner <d@falconindy.com>2011-06-16 20:27:02 +0200
commitc178ddde535dddce27fb230cdd1f501f8eb3ba9b (patch)
tree53dddabb2d8ea21eae61c9beec79661e32e1187c
parent72d53ffeda2d0e46a9a24efadab7469a366e4377 (diff)
downloadmkinitcpio-c178ddde535dddce27fb230cdd1f501f8eb3ba9b.tar.gz
mkinitcpio-c178ddde535dddce27fb230cdd1f501f8eb3ba9b.tar.xz
mkinitcpio: use simple PEs instead of externals
Signed-off-by: Dave Reisner <d@falconindy.com>
-rwxr-xr-xmkinitcpio8
1 files 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}"