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>
2018-01-25 12:12:21 +01:00 · 2018-01-25 12:12:21 +01:00 · e82a95813c
commit e82a95813c
parent 93bf27c8f2
5 changed files with 18 additions and 18 deletions
--- 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
--- 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
--- a/nightly-modular.sh
+++ b/nightly-modular.sh
@ -64,7 +64,7 @@ LOCATION="https://dl.fedoraproject.org/$RSYNCTARGET"
 fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION")
 fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID" "$LOCATION")

-compose-changelog -p $TARGET_DIR/$NEWCOMPOSE_ID/logs/ $TARGET_DIR/$OLDCOMPOSE_ID/ $TARGET_DIR/$NEWCOMPOSE_ID/
+compose-changelog -p $DESTDIR/logs/ $TARGET_DIR/$OLDCOMPOSE_ID/ $DESTDIR/
 # Figure out a version for broken deps e-mail that goes to package maintainers.
 # For Bikeshed it's just bikeshed, for branched versions we prepend F- to the number.
 if [ "$RELEASE" = "bikeshed" ]; then
@ -82,11 +82,11 @@ if [ ! -d "$RSYNCTARGET" ]; then
  mkdir "$RSYNCTARGET"
 fi
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch=aarch64 --arch=ppc64 --arch=ppc64le --arch=s390x --arch src \
-    "$TARGET_DIR/$NEWCOMPOSE_ID" "$RSYNCTARGET/" \
+    "$DESTDIR" "$RSYNCTARGET/" \
    --variant Server \
    --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch=aarch64 --arch=ppc64 --arch=ppc64le --arch=s390x --arch src \
-    "$TARGET_DIR/$NEWCOMPOSE_ID" "$RSYNCTARGET/" \
+    "$DESTDIR" "$RSYNCTARGET/" \
    --variant Server \
    --delete-after
 $RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"
@ -101,7 +101,7 @@ send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
 # Tell everyone by email about the compose
 SUBJECT='Fedora Modular '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
 for tomail in $TOMAIL ; do
-    cat $TARGET_DIR/$NEWCOMPOSE_ID/logs/*verbose | \
+    cat $DESTDIR/logs/*verbose | \
         mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
 done

--- a/nightly.sh
+++ b/nightly.sh
@ -84,7 +84,7 @@ fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "shor
 fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID" "$LOCATION")


-compose-changelog -p $TARGET_DIR/$NEWCOMPOSE_ID/logs/ $TARGET_DIR/$OLDCOMPOSE_ID/ $TARGET_DIR/$NEWCOMPOSE_ID/
+compose-changelog -p $DESTDIR/logs/ $TARGET_DIR/$OLDCOMPOSE_ID/ $DESTDIR/
 # Figure out a version for broken deps e-mail that goes to package maintainers.
 # In Rawhide it's just rawhide, for branched versions we prepend F- to the number.
 if [ "$RELEASE" = "rawhide" ]; then
@ -110,11 +110,11 @@ if [ ! -d "$RSYNCTARGET" ]; then
  mkdir "$RSYNCTARGET"
 fi
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
-    "$TARGET_DIR/$NEWCOMPOSE_ID" "$RSYNCTARGET/" \
+    "$DESTDIR" "$RSYNCTARGET/" \
    --variant Everything --variant Atomic --variant CloudImages --variant Docker --variant Server --variant Spins --variant Workstation \
    --link-dest="$RSYNCTARGET/Everything" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
-    "$TARGET_DIR/$NEWCOMPOSE_ID" "$RSYNCTARGET/" \
+    "$DESTDIR" "$RSYNCTARGET/" \
    --variant Everything --variant Atomic --variant CloudImages --variant Docker --variant Server --variant Spins --variant Workstation \
    --link-dest="$RSYNCTARGET/Everything" --delete-after
 $RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"
@ -125,11 +125,11 @@ if [ ! -d /pub/alt/development/$RELEASE ]; then
  mkdir /pub/alt/development/$RELEASE
 fi
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
-    "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/alt/development/$RELEASE/ \
+    "$DESTDIR" /pub/alt/development/$RELEASE/ \
    --variant Cloud --variant Labs \
    --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
-    "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/alt/development/$RELEASE/ \
+    "$DESTDIR" /pub/alt/development/$RELEASE/ \
    --variant Cloud --variant Labs \
    --link-dest="$RSYNCTARGET/Everything/" --delete-after
 $RSYNCPREFIX rm /pub/alt/development/$RELEASE/.composeinfo
@ -140,10 +140,10 @@ if [ ! -d /pub/fedora-secondary/development/$RELEASE ]; then
  mkdir /pub/fedora-secondary/development/$RELEASE
 fi
 $RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
-    "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/fedora-secondary/development/$RELEASE/ \
+    "$DESTDIR" /pub/fedora-secondary/development/$RELEASE/ \
    --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
-    "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/fedora-secondary/development/$RELEASE/ \
+    "$DESTDIR" /pub/fedora-secondary/development/$RELEASE/ \
    --link-dest="$RSYNCTARGET/Everything/" --delete-after
 $RSYNCPREFIX rm /pub/fedora-secondary/development/$RELEASE/.composeinfo
 $RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/fedora-secondary/development/$RELEASE/ --name "$NEWCOMPOSE_ID"
@ -159,7 +159,7 @@ 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

--- 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