diff options
| author | Bill Nottingham <notting@nostromo.devel.redhat.com> | 2007-05-21 06:12:03 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@nostromo.devel.redhat.com> | 2007-05-21 06:12:03 -0400 |
| commit | d254425bfff92e7f2a8630b8f25b4cdeedfc9a63 (patch) | |
| tree | cb226da4079780f6ebd83c922e7c1bd2214730e8 | |
| parent | fd7cb60d57e535ad4917de2360d62c668c7b16d9 (diff) | |
| download | releng-d254425bfff92e7f2a8630b8f25b4cdeedfc9a63.tar.gz releng-d254425bfff92e7f2a8630b8f25b4cdeedfc9a63.tar.xz releng-d254425bfff92e7f2a8630b8f25b4cdeedfc9a63.zip | |
quote things properly so they work
| -rwxr-xr-x | scripts/buildrawhide | 6 | ||||
| -rwxr-xr-x | scripts/pungify | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/buildrawhide b/scripts/buildrawhide index 793b61c..58b4ff5 100755 --- a/scripts/buildrawhide +++ b/scripts/buildrawhide @@ -31,11 +31,11 @@ cvs -d :pserver:anonymous@cvs.fedora.redhat.com:/cvs/extras -z3 co comps && { mkdir -p /mnt/koji/mash/rawhide-$DATE/logs mash -o /mnt/koji/mash/rawhide-$DATE --compsfile /tmp/mashbuild.$DATE/comps.xml development 2>&1 | tee /mnt/koji/mash/rawhide-$DATE/logs/mash.log rc=$? -if [ "$rc" = "0" ]; then - [ -n "$OLD" ] && /usr/share/mash/treediff /mnt/koji/mash/rawhide-$DATE/development $OLD/development > /mnt/koji/mash/rawihde-$DATE/logs/treediff +if [ "\$rc" = "0" ]; then + [ -n "\$OLD" ] && /usr/share/mash/treediff /mnt/koji/mash/rawhide-$DATE/development \$OLD/development > /mnt/koji/mash/rawhide-$DATE/logs/treediff fi rm -rf /tmp/mashbuild.$DATE -exit $rc +exit \$rc EOF rc=$? umount /mashroot/mnt/koji diff --git a/scripts/pungify b/scripts/pungify index 44825be..b8960b3 100755 --- a/scripts/pungify +++ b/scripts/pungify @@ -21,7 +21,7 @@ usage() { [ -z "$TREE" -o -z "$ARCH" -o -z "$HOST" ] && usage -ssh $HOST /bin/bash -- << EOF +su mock -c "ssh $HOST /bin/bash --" << EOF set -x mock -r fedora-devel-$ARCH-core --uniqueext=$TREE init || exit 1 /usr/sbin/mock-helper yum --installroot /var/lib/mock/fedora-development-$ARCH-core-$TREE/root install pungi nfs-utils setarch || exit 1 @@ -75,7 +75,7 @@ EEE EOF # so, so wrong rsync -vae "ssh -i /var/lib/mock/.ssh/id_dsa" $HOST /var/lib/mock/fedora-development-$ARCH-core-$TREE/root/tmp/treebuild.$TREE/development/$ARCH/os/ /mnt/koji/mash/rawhide-$TREE/development/$ARCH/os/ -ssh $HOST /bin/bash -- << EOF +su mock -c "ssh $HOST /bin/bash --" << EOF set -x mock -r fedora-devel-$ARCH-core --uniqueext=$TREE clean EOF |