- cosmetics

Changed files:
    bin/from-incoming.sh -> 1.8
    bin/move.sh -> 1.6

diff --git a/bin/from-incoming.sh b/bin/from-incoming.sh
index ff578cc7974d4a2f066a274961e39f88047c4b13..fcf84b4468956c6c7cab041c633dc8274da56a66 100755 (executable)
--- a/bin/from-incoming.sh
+++ b/bin/from-incoming.sh
@@ -14,7 +14,7 @@ for i in *uploadinfo; do
                continue
        fi
 
-       srcname=`cat $i|grep '^file:SRPMS'|cut -d: -f 3`
+       srcname=`grep '^file:SRPMS' $i|cut -d: -f 3`
        if [ -f $FTP_DIR/$DEFAULT_TO/SRPMS/.metadata/$srcname.info ]; then
                log "$srcname.info already present in $DEFAULT_TO; newer version removed"
                rm $srcname

diff --git a/bin/move.sh b/bin/move.sh
index 06760fff00beef04dbbbf6aec1317387ce8d93ac..135325235a49728d63932bca415078bbaf620905 100755 (executable)
--- a/bin/move.sh
+++ b/bin/move.sh
@@ -56,7 +56,7 @@ for srcfile in $files; do
                        continue
                fi
                # Remove all files connected to the old src.rpm (+ the src.rpm itself)
-               for i in `cat $oldinfofile|grep '^file:'`; do
+               for i in `grep '^file:' $oldinfofile`; do
                        arch=`echo $i|cut -d: -f 2`
                        file=`echo $i|cut -d: -f 3`
                        rm "$FTP_DIR/$to/$arch/RPMS/$file"
@@ -70,7 +70,7 @@ done
 cd "$FTP_DIR/$from/SRPMS/.metadata/"
 for srcfile in $files; do
        # Move the rpms
-       for i in `cat "$srcfile.src.rpm.info"|grep '^file:'`; do
+       for i in `grep '^file:' "$srcfile.src.rpm.info"`; do
                arch=`echo $i|cut -d: -f 2`
                file=`echo $i|cut -d: -f 3`
                mv "$FTP_DIR/$from/$arch/RPMS/$file" "$FTP_DIR/$to/$arch/RPMS/"