[arch-projects] [mkinitcpio][PATCH 06/19] functions: remove get_dirname and get_basename

Dave Reisner dreisner at archlinux.org
Sun May 13 13:57:09 EDT 2012


A lot has changed since 643e98eeb42677 when these functions were
implemented, and there is exactly 1 case of get_dirname left, and no
calls to get_basename. Remove these, and use a PE in place of the
remaining call.

Signed-off-by: Dave Reisner <dreisner at archlinux.org>
---
 functions |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/functions b/functions
index bca31b4..5d986da 100644
--- a/functions
+++ b/functions
@@ -168,18 +168,6 @@ die() {
     cleanup 1
 }
 
-get_basename() {
-  local base=${1%/}
-  base=${base##*/}
-  printf '%s' "${base:-/}"
-}
-
-get_dirname() {
-  local dir=${1%/}
-  dir=${dir%/*}
-  printf '%s' "${dir:-/}"
-}
-
 in_array() {
     # Search for an element in an array.
     #   $1: needle
@@ -337,7 +325,7 @@ add_symlink() {
 
     (( $# == 2 )) || return 1
 
-    add_dir "$(get_dirname "$1")"
+    add_dir "${1%/*}"
 
     if (( ! QUIET )); then
         if [[ -L $BUILDROOT$1 ]]; then
-- 
1.7.10.2



More information about the arch-projects mailing list