- forced -fPIE/-pie needs gcc 3.4

[packages/rpm.git] / banner.sh

diff --git a/banner.sh b/banner.sh
index 6071b2b834212187ff05a9aa77fc0da776a1fe18..5c92c5c48d4ca7ecd30cb7cd93da94a0454ff049 100644 (file)
--- 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,14 +142,17 @@ 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
-               cat > $BANNER
+               echo "$data" > $BANNER
        else
-               cat >> $BANNER
+               echo "$data" >> $BANNER
        fi
        if [ $SHOW -eq 1 ];then
-               cat $BANNER
+               echo "$data"
        fi
 }
 show_banner()
@@ -187,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
@@ -247,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