SOURCES: banner.sh - kill sed usage

glen glen at pld-linux.org
Fri Jan 20 00:02:27 CET 2006


Author: glen                         Date: Thu Jan 19 23:02:27 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- kill sed usage

---- Files affected:
SOURCES:
   banner.sh (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/banner.sh
diff -u SOURCES/banner.sh:1.4 SOURCES/banner.sh:1.5
--- SOURCES/banner.sh:1.4	Thu Jan 19 19:25:15 2006
+++ SOURCES/banner.sh	Fri Jan 20 00:02:22 2006
@@ -94,10 +94,7 @@
 EOF
 	Help
 }
-check_banner_name()
-{
-	echo "$1"|sed 's,.*/,,'
-}
+
 check_banners_mtime()
 {
 	BANNERS="$1"
@@ -145,7 +142,7 @@
 {
 	BANNER="$1"
 	SHOW="$2"
-	mkdir -p $(echo $BANNER|sed 's,/[^/]*$,,')
+	mkdir -p "${BANNER%/*}"
 	data=$(cat)
 	if [ $NEW_APPEND -eq 0 ]; then
 		echo "$data" > $BANNER
@@ -188,8 +185,8 @@
 			;;
 		-m|--make|-M)
 			NEED_BANNER_LIST=0
-			if [ "$(check_banner_name $2)" == "$2" ]; then
-				NEW_BANNER=$BANNERDIR/$(check_banner_name "$2")
+			if [[ $2 != */* ]]; then
+				NEW_BANNER="$BANNERDIR/${2##*/}"
 			else
 				NEW_BANNER="$2"
 			fi
@@ -248,9 +245,9 @@
 			;;
 		*)
 			if [ $EXCLUDE_FLAG -eq 0 ];then
-				BANNERS="$BANNERS $(check_banner_name $1)"
+				BANNERS="$BANNERS ${1##*/}"
 			else
-				NOBANNERS="$NOBANNERS $(check_banner_name $1)"
+				NOBANNERS="$NOBANNERS ${1##*/}"
 			fi
 			;;
 	esac
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/banner.sh?r1=1.4&r2=1.5&f=u



More information about the pld-cvs-commit mailing list