diff options
| -rwxr-xr-x | build-isos | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -67,15 +67,16 @@ 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}/}" >/dev/null; then rm "${to_delete}" @@ -96,11 +97,10 @@ case "$(hostname -s)" in '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 @@ -113,11 +113,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 ;; |