Commit 3e99eab3 authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch 'origin/doc/16902-no-image-type-extension-in-torrent-directories'

parents cdb2d1ef a8964667
......@@ -732,26 +732,33 @@ images and with a `.sig` extension), then go up to the parent
directory, create a `.torrent` file and check the generated `.torrent`
files metadata:
for type in iso img ; do
mkdir "${ISOS:?}/tails-amd64-${VERSION:?}.${type:?}" && \
cd "${ISOS:?}/tails-amd64-${VERSION:?}.${type:?}" && \
mv "${ARTIFACTS:?}/tails-amd64-${VERSION:?}.${type:?}" . && \
gpg --armor --default-key "${TAILS_SIGNATURE_KEY:?}" --detach-sign *".${type:?}" && \
rename 's,\.asc$,.sig,' *.asc && \
cd .. && \
mktorrent \
-a 'udp://tracker.torrent.eu.org:451' \
-a 'udp://tracker.coppersurfer.tk:6969' \
"tails-amd64-${VERSION:?}.${type:?}" && \
transmission-show tails-amd64-${VERSION:?}.${type:?}.torrent
done
mkdir -p "${ISOS:?}/tails-amd64-${VERSION:?}" && \
for type in iso img ; do
cd "${ISOS:?}/tails-amd64-${VERSION:?}" && \
mv "${ARTIFACTS:?}/tails-amd64-${VERSION:?}.${type:?}" . && \
gpg --armor --default-key "${TAILS_SIGNATURE_KEY:?}" --detach-sign *".${type:?}" && \
rename 's,\.asc$,.sig,' *.asc && \
tmp="$(mktemp -d)" && \
mkdir -p "${tmp:?}/tails-amd64-${VERSION:?}" && \
cd "${tmp:?}/tails-amd64-${VERSION:?}" && \
for x in "${ISOS:?}/tails-amd64-${VERSION:?}"/*; do
ln -s ${x} .
done && \
mktorrent \
-o "${ISOS:?}/tails-amd64-${VERSION:?}.${type:?}.torrent" \
-a 'udp://tracker.torrent.eu.org:451' \
-a 'udp://tracker.coppersurfer.tk:6969' \
"${tmp:?}/tails-amd64-${VERSION:?}" && \
transmission-show "${ISOS:?}/tails-amd64-${VERSION:?}.${type:?}.torrent" && \
rm -rf "${tmp:?}"
done
Lastly, let's set some variables to be used later:
ISO_PATH="${ISOS:?}/tails-amd64-${VERSION:?}.iso/tails-amd64-${VERSION:?}.iso"
ISO_PATH="${ISOS:?}/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.iso"
ISO_SHA256SUM="$(sha256sum "${ISO_PATH:?}" | cut -f 1 -d ' ' | tr -d '\n')"
ISO_SIZE_IN_BYTES="$(stat -c %s "${ISO_PATH:?}")"
IMG_PATH="${ISOS:?}/tails-amd64-${VERSION:?}.img/tails-amd64-${VERSION:?}.img"
IMG_PATH="${ISOS:?}/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.img"
IMG_SHA256SUM="$(sha256sum "${IMG_PATH:?}" | cut -f 1 -d ' ' | tr -d '\n')"
IMG_SIZE_IN_BYTES="$(stat -c %s "${IMG_PATH:?}")"
......@@ -797,8 +804,8 @@ and run the following:
PERL5LIB=\"${PERL5LIB_CHECKOUT:?}/lib\" \
./bin/tails-create-iuk \
--squashfs-diff-name \"${VERSION:?}.squashfs\" \
--old-iso \"${ISOS:?}/tails-amd64-${source_version:?}.iso/tails-amd64-${source_version:?}.iso\" \
--new-iso \"${ISOS:?}/tails-amd64-${VERSION:?}.iso/tails-amd64-${VERSION:?}.iso\" \
--old-iso \"${ISOS:?}/tails-amd64-${source_version:?}/tails-amd64-${source_version:?}.iso\" \
--new-iso \"${ISO_PATH:?}\" \
--outfile \"${ISOS:?}/Tails_amd64_${source_version:?}_to_${VERSION:?}.iuk\""
done
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment