Optimise basename/dirname operations

Replace basename/dirname with shell string processing (thanks, Hedayat
Vatankhah; part of #694668).

diff --git a/common.sh b/common.sh
index c6d3424..98d39fa 100644 (file)
--- a/common.sh
+++ b/common.sh
@@ -52,7 +52,7 @@ progname=
 cache_progname() {
   case $progname in
     '')
-      progname="$(basename "$0")"
+      progname="${0##*/}"
       ;;
   esac
 }

diff --git a/debian/changelog b/debian/changelog
index f93db02..a96b667 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ os-prober (1.72) UNRELEASED; urgency=medium
     options (thanks, Hedayat Vatankhah; closes: #674561).
   * Disable debugging if OS_PROBER_DISABLE_DEBUG is set (thanks, Hedayat
     Vatankhah; closes: #698598).
+  * Replace basename/dirname with shell string processing (thanks, Hedayat
+    Vatankhah; part of #694668).
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 31 Dec 2016 17:11:49 +0000
 

diff --git a/linux-boot-probes/mounted/powerpc/40yaboot b/linux-boot-probes/mounted/powerpc/40yaboot
index 2bb6765..764621c 100755 (executable)
--- a/linux-boot-probes/mounted/powerpc/40yaboot
+++ b/linux-boot-probes/mounted/powerpc/40yaboot
@@ -27,7 +27,7 @@ recordstanza () {
                fi
 
                if [ -z "$title" ]; then
-                       title="$(basename "$kernel")"
+                       title="${kernel##*/}"
                fi
                if [ "$read_only" ]; then
                        parameters="ro $parameters"

diff --git a/os-probes/mounted/x86/efi/10elilo b/os-probes/mounted/x86/efi/10elilo
index 72dc462..d815b52 100755 (executable)
--- a/os-probes/mounted/x86/efi/10elilo
+++ b/os-probes/mounted/x86/efi/10elilo
@@ -9,8 +9,8 @@ found=
 
 elilo=`find $1 -name "elilo.efi"`
 if [ -n "$elilo" ]; then
-       bdir=`dirname $elilo`
-       bdir=`basename $bdir`
+       bdir="${elilo%/*}"
+       bdir="${elilo##*/}"
        long="ELILO Boot Manager"
        short="ELILO"
        path=${bdir}/elilo.efi