diff options
| -rwxr-xr-x | al32-mktorrent.sh | 8 | ||||
| -rwxr-xr-x | build-isos | 38 | ||||
| -rwxr-xr-x | update-website | 18 |
3 files changed, 38 insertions, 26 deletions
diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh index 593b96f..22fa8fb 100755 --- a/al32-mktorrent.sh +++ b/al32-mktorrent.sh @@ -26,7 +26,7 @@ fg_blue="\033[34m" fg_reset="\033[0m" fg_bold="\033[1m" -MIRRORLIST_FILE="https://raw.githubusercontent.com/archlinux32/packages/master/core/pacman-mirrorlist/mirrorlist" +MIRRORLIST_FILE="https://git.archlinux32.org/packages/plain/core/pacman-mirrorlist/mirrorlist" function create_torrent_for_arch () { declare -a available_mirrors @@ -44,7 +44,7 @@ function create_torrent_for_arch () { exit 1 fi - iso_string="archlinux-$iso_date-$arch.iso" + iso_string="archlinux32-$iso_date-$arch.iso" available_mirrors=($mirrorlist) @@ -112,7 +112,7 @@ which transmission-show 2>&1 >/dev/null || ( ### Actual program -declare -a architectures=("i686" "dual") +declare -a architectures=("i686") iso_date='' web_dir='' hefur_dir='' @@ -151,7 +151,7 @@ for a in "${architectures[@]}" ; do done for a in "${architectures[@]}" ; do - torrent_filename="archlinux-$iso_date-$a.iso.torrent" + torrent_filename="archlinux32-$iso_date-$a.iso.torrent" if [ -n "$web_dir" ] ; then feed_filename="feed_$a.rss" upload_file_to_remote_dir "$torrent_filename" "$web_dir" @@ -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 ;; diff --git a/update-website b/update-website index 1bd9507..3aa9570 100755 --- a/update-website +++ b/update-website @@ -197,15 +197,15 @@ fi latest_iso_date="$( ls "${mirror_dir}/archisos" | \ - grep '^archlinux-[0-9.]\+-\(dual\|i.86\)\.iso$' | \ - sed 's@^archlinux-\([0-9.]\+\)-\(dual\|i.86\)\.iso$@\1@' | \ + grep '^archlinux32-[0-9.]\+-\(dual\|i.86\)\.iso$' | \ + sed 's@^archlinux32-\([0-9.]\+\)-\(dual\|i.86\)\.iso$@\1@' | \ sort -k1,1 -u | \ tail -n1 )" declare -A desc desc['i686']='i686 only' -desc['dual']='dual bootable' +# desc['dual']='dual bootable' for arch in "${!desc[@]}"; do if [ ! -s "${tmp_dir}/magnet.${arch}" ]; then @@ -213,8 +213,8 @@ for arch in "${!desc[@]}"; do fi if ! tr '&' '\n' < \ "${tmp_dir}/magnet.${arch}" | \ - grep -qxF "dn=archlinux-${latest_iso_date}-${arch}.iso"; then - >&2 printf 'Magnet link for %s is not for %s, skipping.\n' "${arch}" "archlinux-${latest_iso_date}-${arch}.iso" + grep -qxF "dn=archlinux32-${latest_iso_date}-${arch}.iso"; then + >&2 printf 'Magnet link for %s is not for %s, skipping.\n' "${arch}" "archlinux32-${latest_iso_date}-${arch}.iso" continue fi sed -i ' @@ -227,8 +227,8 @@ for arch in "${!desc[@]}"; do if [ ! -s "${tmp_dir}/torrent-seed.${arch}" ]; then continue fi - if ! grep -qF "archlinux-${latest_iso_date}-${arch}" "${tmp_dir}/torrent-seed.${arch}"; then - >&2 printf 'Torrent seed for %s is not for %s, skipping.\n' "${arch}" "archlinux-${latest_iso_date}-${arch}.iso" + if ! grep -qF "archlinux32-${latest_iso_date}-${arch}" "${tmp_dir}/torrent-seed.${arch}"; then + >&2 printf 'Torrent seed for %s is not for %s, skipping.\n' "${arch}" "archlinux32-${latest_iso_date}-${arch}.iso" continue fi sed -i ' @@ -248,7 +248,7 @@ declare -A md5 declare -A sha512 for arch in "${!desc[@]}"; do - iso="${mirror_dir}/archisos/archlinux-${latest_iso_date}-${arch}.iso" + iso="${mirror_dir}/archisos/archlinux32-${latest_iso_date}-${arch}.iso" if [ ! -f "${iso}" ]; then >&2 echo "Can't find iso to arch ${arch}." exit 1 @@ -326,7 +326,7 @@ done sed -i "$( printf '/%s:/s|</strong>.*</li>|</strong> %s</li>|\n' "${values[@]}" - printf '/archlinux-[0-9.]\+-%s\.iso\.sig/s@archlinux-[0-9.]\+-%s\.iso\.sig@archlinux-%s-%s.iso.sig@\n' \ + printf '/archlinux32-[0-9.]\+-%s\.iso\.sig/s@archlinux32-[0-9.]\+-%s\.iso\.sig@archlinux32-%s-%s.iso.sig@\n' \ 'i686' 'i686' "${latest_iso_date}" 'i686' \ 'dual' 'dual' "${latest_iso_date}" 'dual' ) |