From 7e50c64a0fe707fc329eada405638ea376fdb1eb Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Apr 12 2017 13:24:37 +0000
Subject: Fix strings based on PR feedback.


Signed-off-by: Ralph Bean <rbean@redhat.com>

---

diff --git a/fedora-modular.conf b/fedora-modular.conf
index 035f85a..8392abe 100644
--- a/fedora-modular.conf
+++ b/fedora-modular.conf
@@ -173,7 +173,7 @@ global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'
 global_release = None
 global_version = 'Rawhide'
 # live_images ignores this in favor of live_target
-global_target = 'f26'
+global_target = 'f27'
 
 image_build = {}
 
@@ -189,7 +189,7 @@ failable_deliverables = [
     })
 ]
 
-live_target = 'f26'
+live_target = 'f27'
 live_images_no_rename = True
 # fomat: [(variant_uid_regex, {arch|*: scm_dict})]
 live_images = [
diff --git a/nightly-modular.sh b/nightly-modular.sh
index 61e11e7..965f64d 100755
--- a/nightly-modular.sh
+++ b/nightly-modular.sh
@@ -22,7 +22,7 @@ RSYNCPREFIX="sudo -u ftpsync"
 ATOMIC=$(mktemp -d /tmp/atomic.${DIST}.$DATE.XXXX)
 ATOMICREPO="/mnt/koji/compose/atomic/$BRANCHED/"
 ATOMICDEST="/mnt/koji/atomic/$BRANCHED/"
-OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-ModularRawhide/COMPOSE_ID)
+OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Modular-Rawhide/COMPOSE_ID)
 
 # assume a releng dir is a git checkout of the releng repo
 # if it does not exist clone it
@@ -52,7 +52,7 @@ fi
 
 time $CMD "$@"
 
-NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-ModularRawhide/COMPOSE_ID)
+NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Modular-Rawhide/COMPOSE_ID)
 SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-Modular.*-||g')
 fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "compose_id": "%s"}' "$BRANCHED" "$ARCH" "$NEWCOMPOSE_ID")
 fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "compose_id": "%s"}' "$BRANCHED" "$ARCH" "$NEWCOMPOSE_ID")
@@ -61,4 +61,4 @@ fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "compos
 send_fedmsg "${fedmsg_json_done}" ${DIST} complete
 
 # Remove old composes older than 14 days
-find $TARGET_DIR/*FedoraMod*  -xdev -depth -maxdepth 2 -mtime +14  -exec rm -rf {} \;
+find $TARGET_DIR/Fedora-Modular-Rawhide*  -xdev -depth -maxdepth 2 -mtime +14  -exec rm -rf {} \;