summaryrefslogtreecommitdiff
path: root/build-isos
diff options
context:
space:
mode:
Diffstat (limited to 'build-isos')
-rwxr-xr-xbuild-isos38
1 files changed, 25 insertions, 13 deletions
diff --git a/build-isos b/build-isos
index 6843fe1..5541fe6 100755
--- a/build-isos
+++ b/build-isos
@@ -36,6 +36,9 @@ case "$(hostname -s)" in
sed 's,^.*/,,'
)
+ mountpoint -q "${archive}" || sudo mount "${archive}"
+ mountpoint -q "${destination%/*}" || sudo mount "${destination%/*}"
+
cd "${tmp_dir}"
cp "${destination}/sha512sums" .
cp "${destination}/md5sums" .
@@ -67,31 +70,40 @@ case "$(hostname -s)" in
printf '%s.torrent\n' ${isos}
) feed_dual.rss feed_i686.rss "${destination}/"
+# --torrent-seed-dual "https://pool.mirror.archlinux32.org/archisos/archlinux32-${date}-dual.iso.torrent" \
+#
git -C "${base_dir}/../archweb32" pull --ff-only
"${base_dir}/update-website" \
- --torrent-seed-i686 "https://pool.mirror.archlinux32.org/archisos/archlinux-${date}-i686.iso.torrent" \
- --torrent-seed-dual "https://pool.mirror.archlinux32.org/archisos/archlinux-${date}-dual.iso.torrent" \
+ --torrent-seed-i686 "https://pool.mirror.archlinux32.org/archisos/archlinux32-${date}-i686.iso.torrent" \
--update-iso
git -C "${base_dir}/../archweb32" commit 'download/index.html' -m 'download/index.html: new isos ('"${date}"')'
git -C "${base_dir}/../archweb32" push
- find "${destination}" -name 'archlinux-*' -not -name 'archlinux-'"${date}"'-*' \
+ find "${destination}" \( -name 'archlinux32-*' -o -name 'archlinux-*' \) -not -name 'archlinux32-'"${date}"'-*' \
| while read -r to_delete; do
- if diff -q "${to_delete}" "${archive}/iso/${to_delete#${destination}/}"; then
+ if diff -q "${to_delete}" "${archive}/iso/${to_delete#${destination}/}" >/dev/null; then
rm "${to_delete}"
+ printf '%s\n' "${to_delete}" \
+ | sed '
+ s@^.*/@@
+ s/\./\\./g
+ s@.*@/ \0$/d@
+ '
fi
- done
+ done \
+ >> "${tmp_dir}/delete-regex"
+ sed -i -f "${tmp_dir}/delete-regex" "${destination}/sha512sums"
+ sed -i -f "${tmp_dir}/delete-regex" "${destination}/md5sums"
echo '... done.'
;;
'nlopc46')
if [ "$(whoami)" = 'root' ]; then
cd "/usr/share/archiso/configs/$1"
- rm --one-file-system -rf out work
- mkdir out work
- ./build.sh
- chown "${SUDO_USER}:users" out/archlinux-*.iso
- mv out/archlinux-*.iso "$2/"
+ tmp_dir=$(mktemp -d)
+ trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
+ arch=i686 setarch i686 mkarchiso -o "$2" -w "${tmp_dir}" -v /usr/share/archiso/configs/$1
+ chown "${SUDO_USER}:users" "$2/"archlinux*.iso
exit
fi
@@ -104,11 +116,11 @@ case "$(hostname -s)" in
>&2 echo '... done.'
- >&2 echo 'build dual-iso ...'
+# >&2 echo 'build dual-iso ...'
- >&2 sudo "$0" releng-dual ~/archisos/
+# >&2 sudo "$0" releng-dual ~/archisos/
- >&2 echo '... done.'
+# >&2 echo '... done.'
find ~/archisos/ -type f
;;