From e128ca9d2a5c31c4d0571e4d947ee205625a916c Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Feb 27 2016 03:18:42 +0000
Subject: set RSYNCPREFIX so we sudo when needed


Signed-off-by: Dennis Gilmore <dennis@ausil.us>

---

diff --git a/nightly.sh b/nightly.sh
index a4ae02c..0d0d935 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -12,6 +12,7 @@ DEST=$(pwd)
 DATE=$(date "+%Y%m%d")
 DIST="24"
 BRANCHED="24"
+BRANCH="branched"
 COMPSFILE="comps-f24.xml"
 GIT_BRANCH="f24"
 TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`
@@ -49,6 +50,7 @@ fi
 
 time $CMD "$@"
 NEWCOMPOSE_ID=$(cat /mnt/koji/compose/rawhide/latest-Fedora-/COMPOSE_ID)
+SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
 
 DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
 MOCKCONFIG="fedora-${DIST}-compose-x86_64"
@@ -58,11 +60,11 @@ $MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "mkdir -p ${DESTDIR}/compose/Atom
 $MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell ""
 $MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "if [ ! -d $ATOMICREPO ]; then ostree init --repo=$ATOMICREPO --mode=archive-z2;fi"
 $MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "git clone https://git.fedorahosted.org/git/fedora-atomic.git $ATOMIC && pushd $ATOMIC && git log -n 1 --pretty='%h: %ci - %s' && git checkout ${GIT_BRANCH}"
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "cd $ATOMIC && sed -i -e 's|mirrorlist=.*$|baseurl=http://kojipkgs.fedoraproject.org/compose/$BRANCHED/$NEWCOMPOSE_ID/compose/Everything/x86_64/os/|g' fedora*repo"
+$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "cd $ATOMIC && sed -i -e 's|mirrorlist=.*$|baseurl=http://kojipkgs.fedoraproject.org/compose/$BRANCH/$NEWCOMPOSE_ID/compose/Everything/x86_64/os/|g' fedora*repo"
 $MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "rpm-ostree compose tree --repo=$ATOMICREPO $ATOMIC/fedora-atomic-docker-host.json >$logdir/atomic"
 
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "lorax --nomacboot -p Fedora -v ${SHORTVERSION} -r ${SHORTCOMPOSE} \
-                                                 -s http://kojipkgs.fedoraproject.org/compose/$BRANCHED/$NEWCOMPOSE_ID/compose/Everything/x86_64/os/ \
+$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "lorax --nomacboot -p Fedora -v ${VERSION} -r ${SHORTCOMPOSE_ID} \
+                                                 -s http://kojipkgs.fedoraproject.org/compose/$BRANCH/$NEWCOMPOSE_ID/compose/Everything/x86_64/os/ \
                                                  -i fedora-productimg-atomic \
                                                  -t Atomic \
                                                  --tmp /tmp/ \
@@ -84,14 +86,14 @@ compose-changelog -p $TARGET_DIR/$NEWCOMPOSE_ID/logs/ $TARGET_DIR/$OLDCOMPOSE_ID
 
 for dir in Everything Atomic CloudImages Docker Server Spins Workstation ; 
   do
-    rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/fedora/linux/development/$DIST/$dir/ --link-dest=/pub/fedora/linux/development/$DIST/Everything/ --exclude=repodata ; 
-    rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/fedora/linux/development/$DIST/$dir/ --link-dest=/pub/fedora/linux/development/$DIST/Everything/ --delete-after ; 
+    $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/fedora/linux/development/$DIST/$dir/ --link-dest=/pub/fedora/linux/development/$DIST/Everything/ --exclude=repodata ;
+    $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/fedora/linux/development/$DIST/$dir/ --link-dest=/pub/fedora/linux/development/$DIST/Everything/ --delete-after ;
   done
 
 for dir in Cloud Labs ;
   do
-    rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/alt/development/$DIST/$dir/ --link-dest=/pub/fedora/linux/development/$DIST/Everything/ --exclude=repodata ; 
-    rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/alt/development/$DIST/$dir/ --link-dest=/pub/fedora/linux/development/$DIST/Everything/ --delete-after ; 
+    $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/alt/development/$DIST/$dir/ --link-dest=/pub/fedora/linux/development/$DIST/Everything/ --exclude=repodata ;
+    $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/alt/development/$DIST/$dir/ --link-dest=/pub/fedora/linux/development/$DIST/Everything/ --delete-after ;
   done
 
 if [ "$mail" = "0" ]; then