diff --git a/nightly-modular.sh b/nightly-modular.sh index 5a62a17..c099a2c 100755 --- a/nightly-modular.sh +++ b/nightly-modular.sh @@ -59,7 +59,7 @@ SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-Modular.*-||g') # Set this to use later for a few items include depcheck DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID # Public URL the synced compose will wind up at, we put it in fedmsgs -LOCATION="https://dl.fedoraproject.org/$RSYNCTARGET" +LOCATION="https://dl.fedoraproject.org$RSYNCTARGET" # Update fedmsg template 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") diff --git a/nightly.sh b/nightly.sh index f05ffa4..8a9e146 100755 --- a/nightly.sh +++ b/nightly.sh @@ -80,9 +80,9 @@ SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g') # Set this to use later for a few items include depcheck DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID # Public URLs the synced compose will wind up at, we put them in fedmsgs -LOCATION="https://dl.fedoraproject.org/$RSYNCTARGET" -ALT_LOCATION="https://dl.fedoraproject.org/$RSYNCALTTARGET" -SECONDARY_LOCATION="https://dl.fedoraproject.org/$RSYNCSECTARGET" +LOCATION="https://dl.fedoraproject.org$RSYNCTARGET" +ALT_LOCATION="https://dl.fedoraproject.org$RSYNCALTTARGET" +SECONDARY_LOCATION="https://dl.fedoraproject.org$RSYNCSECTARGET" # Update fedmsg template fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s", "alt_location": "%s", "secondary_location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION", "$ALT_LOCATION", "$SECONDARY_LOCATION") fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s", "alt_location": "%s", "secondary_location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION", "$ALT_LOCATION", "$SECONDARY_LOCATION") diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 6acc3c1..dd75a72 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -64,7 +64,7 @@ SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g') DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID # Public URL the synced compose will wind up at, we put it in fedmsgs -LOCATION="https://dl.fedoraproject.org/$RSYNCTARGET" +LOCATION="https://dl.fedoraproject.org$RSYNCTARGET" # Update fedmsg template 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")