get rid of "basename"
authorHarald Hoyer <harald@redhat.com>
Tue, 24 Jul 2012 12:12:36 +0000 (14:12 +0200)
committerHarald Hoyer <harald@redhat.com>
Tue, 24 Jul 2012 12:12:36 +0000 (14:12 +0200)
dracut-functions.sh
lsinitrd.sh
modules.d/95udev-rules/module-setup.sh

index 7f834f0..14c100d 100755 (executable)
@@ -710,12 +710,12 @@ inst_rule_programs() {
                 _bin=${udevdir}/$_prog
             else
                 _bin=$(find_binary "$_prog") || {
-                    dinfo "Skipping program $_prog using in udev rule $(basename $1) as it cannot be found"
+                    dinfo "Skipping program $_prog using in udev rule $(${1##*/}) as it cannot be found"
                     continue;
                 }
             fi
 
-            #dinfo "Installing $_bin due to it's use in the udev rule $(basename $1)"
+            #dinfo "Installing $_bin due to it's use in the udev rule $(${1##*/})"
             dracut_install "$_bin"
         done
     fi
@@ -725,12 +725,12 @@ inst_rule_programs() {
                 _bin=${udevdir}/$_prog
             else
                 _bin=$(find_binary "$_prog") || {
-                    dinfo "Skipping program $_prog using in udev rule $(basename $1) as it cannot be found"
+                    dinfo "Skipping program $_prog using in udev rule $(${1##*/}) as it cannot be found"
                     continue;
                 }
             fi
 
-            #dinfo "Installing $_bin due to it's use in the udev rule $(basename $1)"
+            #dinfo "Installing $_bin due to it's use in the udev rule $(${1##*/})"
             dracut_install "$_bin"
         done
     fi
@@ -740,12 +740,12 @@ inst_rule_programs() {
                 _bin=${udevdir}/$_prog
             else
                 _bin=$(find_binary "$_prog") || {
-                    dinfo "Skipping program $_prog using in udev rule $(basename $1) as it cannot be found"
+                    dinfo "Skipping program $_prog using in udev rule $(${1##*/}) as it cannot be found"
                     continue;
                 }
             fi
 
-            #dinfo "Installing $_bin due to it's use in the udev rule $(basename $1)"
+            #dinfo "Installing $_bin due to it's use in the udev rule $(${1##*/})"
             dracut_install "$_bin"
         done
     fi
index a844932..3d6084d 100755 (executable)
@@ -21,7 +21,7 @@
 
 usage()
 {
-    echo "Usage: $(basename $0) [-s] [<initramfs file> [<filename>]]"
+    echo "Usage: $(${0##*/}) [-s] [<initramfs file> [<filename>]]"
 }
 
 [[ $# -le 2 ]] || { usage ; exit 1 ; }
index 90d4336..2e3c955 100755 (executable)
@@ -8,7 +8,7 @@ install() {
     # Fixme: would be nice if we didn't have to know which rules to grab....
     # ultimately, /lib/initramfs/rules.d or somesuch which includes links/copies
     # of the rules we want so that we just copy those in would be best
-    dracut_install udevadm cat uname basename blkid \
+    dracut_install udevadm cat uname blkid \
         /etc/udev/udev.conf /etc/group
 
     [ -d ${initdir}/lib/systemd ] || mkdir -p ${initdir}/lib/systemd