From ba0e8d7fcc25249e2168980bb399523c032133c2 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Jan 26 2018 12:34:18 +0000
Subject: nightly scripts: Use $DESTDIR more


We set $DESTDIR in all these scripts, but then use its value
several times without just...using it. Let's use it!

Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/cloud-nightly.sh b/cloud-nightly.sh
index 3b97218..30b84c1 100755
--- a/cloud-nightly.sh
+++ b/cloud-nightly.sh
@@ -75,7 +75,7 @@ $RSYNCPREFIX mkdir -p $DESTDIR
 #send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
 #for dir in CloudImage metadata ;
 #  do
-#    $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;
+#    $RSYNCPREFIX rsync -avhH $DESTDIR/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;
 #  done
 # Tell interested persons that the rsync is done.
 #send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
@@ -84,6 +84,6 @@ send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
 # Tell everyone by email about the compose
 SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
 #for tomail in $TOMAIL ; do
-#    cat $TARGET_DIR/$NEWCOMPOSE_ID/logs/*verbose $DESTDIR/logs/depcheck | \
+#    cat $DESTDIR/logs/*verbose $DESTDIR/logs/depcheck | \
 #         mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
 #done
diff --git a/docker-nightly.sh b/docker-nightly.sh
index c9c178c..f49fe0f 100755
--- a/docker-nightly.sh
+++ b/docker-nightly.sh
@@ -74,7 +74,7 @@ $RSYNCPREFIX mkdir -p $DESTDIR
 #send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
 #for dir in Docker metadata ;
 #  do
-#    $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;
+#    $RSYNCPREFIX rsync -avhH $DESTDIR/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;
 #  done
 # Tell interested persons that the rsync is done.
 #send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
@@ -82,6 +82,6 @@ $RSYNCPREFIX mkdir -p $DESTDIR
 send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
 SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
 #for tomail in $TOMAIL ; do
-#    cat $TARGET_DIR/$NEWCOMPOSE_ID/logs/*verbose $DESTDIR/logs/depcheck | \
+#    cat $DESTDIR/logs/*verbose $DESTDIR/logs/depcheck | \
 #         mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
 #done
diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh
index c27ad83..3326afb 100755
--- a/twoweek-nightly.sh
+++ b/twoweek-nightly.sh
@@ -74,7 +74,7 @@ $RSYNCPREFIX mkdir -p $DESTDIR
 send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
 for dir in Atomic CloudImages Docker metadata ;
   do
-    $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ "$RSYNCTARGET/$dir/" ;
+    $RSYNCPREFIX rsync -avhH $DESTDIR/compose/$dir/ "$RSYNCTARGET/$dir/" ;
     $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name $NEWCOMPOSE_ID
   done
 # Tell interested persons that the rsync is done.
@@ -83,6 +83,6 @@ send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
 send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
 SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
 #for tomail in $TOMAIL ; do
-#    cat $TARGET_DIR/$NEWCOMPOSE_ID/logs/*verbose $DESTDIR/logs/depcheck | \
+#    cat $DESTDIR/logs/*verbose $DESTDIR/logs/depcheck | \
 #         mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
 #done