X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=banner.sh;h=5c92c5c48d4ca7ecd30cb7cd93da94a0454ff049;hp=854f94bec4ae767e2f70dc296297b78463e9c7e8;hb=0b434824beb20824c604559378942e29473be440;hpb=2fbc8cb5936dac98805a730781d85ef9121ebc71

diff --git a/banner.sh b/banner.sh
index 854f94b..5c92c5c 100644
--- a/banner.sh
+++ b/banner.sh
@@ -94,10 +94,7 @@ Unknown parameter $1
 EOF
 	Help
 }
-check_banner_name()
-{
-	echo "$1"|sed 's,.*/,,'
-}
+
 check_banners_mtime()
 {
 	BANNERS="$1"
@@ -145,7 +142,9 @@ make_banner()
 {
 	BANNER="$1"
 	SHOW="$2"
-	mkdir -p $(echo $BANNER|sed 's,/[^/]*$,,')
+	if [ ! -d "${BANNER%/*}" ]; then
+		mkdir -p "${BANNER%/*}"
+	fi
 	data=$(cat)
 	if [ $NEW_APPEND -eq 0 ]; then
 		echo "$data" > $BANNER
@@ -188,8 +187,8 @@ while [ ! -z $1 ]; do
 			;;
 		-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 +247,9 @@ while [ ! -z $1 ]; do
 			;;
 		*)
 			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