summaryrefslogtreecommitdiff
path: root/parabolaiso/mkmetadata
diff options
context:
space:
mode:
Diffstat (limited to 'parabolaiso/mkmetadata')
-rwxr-xr-xparabolaiso/mkmetadata9
1 files changed, 4 insertions, 5 deletions
diff --git a/parabolaiso/mkmetadata b/parabolaiso/mkmetadata
index 1724765..2bf336e 100755
--- a/parabolaiso/mkmetadata
+++ b/parabolaiso/mkmetadata
@@ -14,12 +14,11 @@ which rhash &> /dev/null && readonly HAS_RHASH=1 || readonly HAS_RHASH=0
readonly SHOULD_MKTORRENT=0
[[ -n "${ISOS_URL}" ]] && readonly PUBLIC_URL="${ISOS_URL}/$(basename ${OUT_DIR})"
-[[ -n "${ISOS_URL}" ]] && readonly SIG_URL="${PUBLIC_URL}/${IMG_NAME}.sig"
-[[ -n "${ISOS_URL}" ]] && readonly PUBLISH_MSG="The directory: '${OUT_DIR}' should be copied in tact to the repo server such that it is accessible via the URL: ${PUBLIC_URL}/"
-[[ -n "${ISOS_URL}" ]] && (( ${SHOULD_MKTORRENT} )) && SIG_MSG="The torrent expects the GPG signature to be accessible at: ${SIG_URL}"
+[[ -n "${ISOS_URL}" ]] && readonly SIG_URL=" - GPG signature: ${PUBLIC_URL}/${IMG_NAME}.sig"
+[[ -n "${ISOS_URL}" ]] && readonly PUBLISH_MSG="The directory: '${OUT_DIR}' should be copied to the repo server entirely, preserving the directory name; such that it is accessible via the URL:\n\t${PUBLIC_URL}/\nThe GPG signature of the ISO should be added to that directory; such that it is accessible at the URL:\n\t${SIG_URL}"
readonly ISO_HOST_PATH=$(echo "$(basename ${OUT_DIR})/${IMG_NAME}" | sed 's|\s|%20|')
-readonly WEBSEEDS_CSV=$(echo $urls | sed -E "s|([^ ]+)|\1${ISO_HOST_PATH}|g" | tr ' ' ',')
+readonly WEBSEEDS_CSV=$(echo ${TORRENT_WEBSEED_URLS} | sed -E "s|([^ ]+)|\1${ISO_HOST_PATH}|g" | tr ' ' ',')
readonly PKGLIST_SUCCESS_MSG="\t=> copied $(basename ${PKGLIST} 2> /dev/null)"
readonly SHA512SUMS_SUCCESS_MSG="\t=> SHA512SUMS appended"
@@ -63,4 +62,4 @@ then echo "$MAKE_METADATA_MSG"
popd > /dev/null
fi
-[[ -n "${ISOS_URL}" ]] && echo "\n${PUBLISH_MSG}\n${SIG_MSG}"
+[[ -n "${ISOS_URL}" ]] && echo -e "\n${PUBLISH_MSG}\n"