Loading arm-link +9 −52 Original line number Diff line number Diff line Loading @@ -18,13 +18,15 @@ LOCKFILE=~/."${0##*/}".lock ARMBASE=/srv/ftp/archlinux/arm PKGTREE=packages PKGFLAT=all ARCBASE=/srv/ftp/archlinux/archive/repos LAST=last LASTM=month LASTW=week [[ $1 != "" && ${1:0:1} != / ]] && { echo 'Absolute path please, ln is bugged'; exit 1; } [[ -t 1 ]] && set -x # we lock! exec 9> "$LOCKFILE" flock -n 9 || { echo 'Locking Failed' >&2; exit 1; } Loading @@ -34,58 +36,13 @@ umask 022 cd "$ARMBASE" # update last ln -srnf "$(ls -1d "$ARCBASE"/*/*/*|sort|tail -n1)" "$LAST" # update last month ln -snf "$(date +%Y/%m/01)" "$LASTM" ln -srnf "$(date +%Y/%m/01)" "$LASTM" # update last week ln -snf "$(date -d 'last monday' +%Y/%m/%d)" "$LASTW" for _d in "$PKGTREE" "$PKGFLAT"; do # ensure dir are here [[ -e $_d ]] || mkdir -p "$_d" echo ":: removing dead links in ${_d##*/}" find -L "$_d" -type l -delete -print echo ":: removing empty directories in ${_d##*/}" find "$_d" -type d -empty -delete -print done # create new links pass echo ':: creating new links' find ${1:-"$ARMBASE"/20??} -type f -name '*.pkg.tar.xz'| while read src; do filename="${src##*/}" pkgname="${filename%-*}" #remove arch and extension pkgname="${pkgname%-*}" #remove pkgrel pkgname="${pkgname%-*}" #remove pkgver first="${pkgname:0:1}" parent="$ARMBASE/$PKGTREE/${first,,}/$pkgname" # destination in tree tdst="$parent/$filename" # destination in flat dir fdst="$ARMBASE/$PKGFLAT/$filename" # ensure pkgtree dad dir is present [[ -d "$parent" ]] || mkdir -v -p "$parent" # copy file if necessary if [[ "$src" -nt "$tdst" ]]; then # remove is necessary to be done and not use -f in ln # because this create buggy relative symlink in some case. # there is fix around this in next coreutils [[ -e "$tdst" ]] && rm -f -v "$tdst" # don't use harlink, to be able to easily remove package by date # removing a directory by date, will remove symlink in the clean pass ln -v -r -s "$src" "$tdst" fi if [[ "$src" -nt "$fdst" ]]; then [[ -e "$fdst" ]] && rm -f -v "$fdst" ln -v -r -s "$src" "$fdst" fi done # disallow listing of PKGFLAT. Too much file echo 'No listing allowed here.' > "$PKGFLAT"/index.html touch "$PKGTREE" "$PKGFLAT" ln -srnf "$(date -d 'last monday' +%Y/%m/%d)" "$LASTW" # vim:set sw=2 ts=2 ft=sh et: package-links 0 → 100755 +80 −0 Original line number Diff line number Diff line #!/bin/bash -e # Copyright © Sébastien Luttringer # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. LOCKFILE=~/."${0##*/}".lock REPOS=/srv/ftp/archlinux/archive/repos BASE=/srv/ftp/archlinux/archive/packages PKGFLAT=.all [[ $1 != "" && ${1:0:1} != / ]] && { echo 'Absolute path please, ln is bugged'; exit 1; } # we lock! exec 9> "$LOCKFILE" flock -n 9 || { echo 'Locking Failed' >&2; exit 1; } [[ -t 1 ]] && set -x # nice umask umask 022 # ensure dirs are here [[ -e $BASE/$PKGFLAT ]] || mkdir -p "$BASE/$PKGFLAT" echo ":: removing dead links in ${BASE##*/}" find -L "$BASE" -type l -delete -print # create new links pass echo ':: creating new links' find ${1:-$REPOS} -type f -name '*.pkg.tar.xz' -o -name '*.pkg.tar.xz.sig'| while read src; do filename="${src##*/}" pkgname="${filename%-*}" #remove arch and extension pkgname="${pkgname%-*}" #remove pkgrel pkgname="${pkgname%-*}" #remove pkgver first="${pkgname:0:1}" parent="$BASE/${first,,}/$pkgname" # destination in tree tdst="$parent/$filename" # destination in flat dir fdst="$BASE/$PKGFLAT/$filename" # ensure pkgtree parent dir is present [[ -d "$parent" ]] || mkdir -v -p "$parent" # copy file if necessary if [[ "$src" -nt "$tdst" ]]; then # remove is necessary to be done and not use -f in ln # because this create buggy relative symlink in some case. # there is fix around this in next coreutils [[ -e "$tdst" ]] && rm -f -v "$tdst" # don't use harlink, to be able to easily remove package by date # removing a directory by date, will remove symlink in the clean pass ln -v -r -s "$src" "$tdst" fi if [[ "$src" -nt "$fdst" ]]; then [[ -e "$fdst" ]] && rm -f -v "$fdst" ln -v -r -s "$src" "$fdst" fi done # disallow listing of PKGFLAT. Too much file echo 'No listing allowed here.' > "$BASE/$PKGFLAT/index.html" echo ":: removing empty directories in ${BASE##*/}" find "$BASE" -type d -empty -delete -print touch "$BASE" "$BASE/$PKGFLAT" # vim:set sw=2 ts=2 ft=sh et: arm-sync→repo-rsync +3 −17 Original line number Diff line number Diff line Loading @@ -20,10 +20,10 @@ UPSTREAM='rsync://pkgbuild.com/packages/' LOCKFILE=~/."${0##*/}".lock ARMBASE=/srv/ftp/archlinux/arm BASE=/srv/ftp/archlinux/archive/repos SNAPR="$(date +%Y/%m/%d)" SNAP="$ARMBASE/$SNAPR" LAST="$ARMBASE/last" SNAP="$BASE/$SNAPR" LAST="$(ls -1d "$BASE"/*/*/*|sort|tail -n1)" # we lock! exec 9> "$LOCKFILE" Loading @@ -42,18 +42,4 @@ rsync -rltH --link-dest="$LAST/" --exclude '*/.*' "$UPSTREAM" "$SNAP/" # only to have a quick check of sync in listdir touch "$SNAP" # update last symlink only when last rsync is successful (bash -e) ln -snf "$SNAPR" "$LAST" # update package list if type -P arm-link &>/dev/null; then arm-link "$LAST/" >/dev/null fi # use hardlink to optimize space usage # currently disabled because hardlink segfault #if type -P hardlink &>/dev/null; then # hardlink "$ARMBASE" >/dev/null || true #fi # vim:set sw=2 ts=2 ft=sh et: Loading
arm-link +9 −52 Original line number Diff line number Diff line Loading @@ -18,13 +18,15 @@ LOCKFILE=~/."${0##*/}".lock ARMBASE=/srv/ftp/archlinux/arm PKGTREE=packages PKGFLAT=all ARCBASE=/srv/ftp/archlinux/archive/repos LAST=last LASTM=month LASTW=week [[ $1 != "" && ${1:0:1} != / ]] && { echo 'Absolute path please, ln is bugged'; exit 1; } [[ -t 1 ]] && set -x # we lock! exec 9> "$LOCKFILE" flock -n 9 || { echo 'Locking Failed' >&2; exit 1; } Loading @@ -34,58 +36,13 @@ umask 022 cd "$ARMBASE" # update last ln -srnf "$(ls -1d "$ARCBASE"/*/*/*|sort|tail -n1)" "$LAST" # update last month ln -snf "$(date +%Y/%m/01)" "$LASTM" ln -srnf "$(date +%Y/%m/01)" "$LASTM" # update last week ln -snf "$(date -d 'last monday' +%Y/%m/%d)" "$LASTW" for _d in "$PKGTREE" "$PKGFLAT"; do # ensure dir are here [[ -e $_d ]] || mkdir -p "$_d" echo ":: removing dead links in ${_d##*/}" find -L "$_d" -type l -delete -print echo ":: removing empty directories in ${_d##*/}" find "$_d" -type d -empty -delete -print done # create new links pass echo ':: creating new links' find ${1:-"$ARMBASE"/20??} -type f -name '*.pkg.tar.xz'| while read src; do filename="${src##*/}" pkgname="${filename%-*}" #remove arch and extension pkgname="${pkgname%-*}" #remove pkgrel pkgname="${pkgname%-*}" #remove pkgver first="${pkgname:0:1}" parent="$ARMBASE/$PKGTREE/${first,,}/$pkgname" # destination in tree tdst="$parent/$filename" # destination in flat dir fdst="$ARMBASE/$PKGFLAT/$filename" # ensure pkgtree dad dir is present [[ -d "$parent" ]] || mkdir -v -p "$parent" # copy file if necessary if [[ "$src" -nt "$tdst" ]]; then # remove is necessary to be done and not use -f in ln # because this create buggy relative symlink in some case. # there is fix around this in next coreutils [[ -e "$tdst" ]] && rm -f -v "$tdst" # don't use harlink, to be able to easily remove package by date # removing a directory by date, will remove symlink in the clean pass ln -v -r -s "$src" "$tdst" fi if [[ "$src" -nt "$fdst" ]]; then [[ -e "$fdst" ]] && rm -f -v "$fdst" ln -v -r -s "$src" "$fdst" fi done # disallow listing of PKGFLAT. Too much file echo 'No listing allowed here.' > "$PKGFLAT"/index.html touch "$PKGTREE" "$PKGFLAT" ln -srnf "$(date -d 'last monday' +%Y/%m/%d)" "$LASTW" # vim:set sw=2 ts=2 ft=sh et:
package-links 0 → 100755 +80 −0 Original line number Diff line number Diff line #!/bin/bash -e # Copyright © Sébastien Luttringer # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. LOCKFILE=~/."${0##*/}".lock REPOS=/srv/ftp/archlinux/archive/repos BASE=/srv/ftp/archlinux/archive/packages PKGFLAT=.all [[ $1 != "" && ${1:0:1} != / ]] && { echo 'Absolute path please, ln is bugged'; exit 1; } # we lock! exec 9> "$LOCKFILE" flock -n 9 || { echo 'Locking Failed' >&2; exit 1; } [[ -t 1 ]] && set -x # nice umask umask 022 # ensure dirs are here [[ -e $BASE/$PKGFLAT ]] || mkdir -p "$BASE/$PKGFLAT" echo ":: removing dead links in ${BASE##*/}" find -L "$BASE" -type l -delete -print # create new links pass echo ':: creating new links' find ${1:-$REPOS} -type f -name '*.pkg.tar.xz' -o -name '*.pkg.tar.xz.sig'| while read src; do filename="${src##*/}" pkgname="${filename%-*}" #remove arch and extension pkgname="${pkgname%-*}" #remove pkgrel pkgname="${pkgname%-*}" #remove pkgver first="${pkgname:0:1}" parent="$BASE/${first,,}/$pkgname" # destination in tree tdst="$parent/$filename" # destination in flat dir fdst="$BASE/$PKGFLAT/$filename" # ensure pkgtree parent dir is present [[ -d "$parent" ]] || mkdir -v -p "$parent" # copy file if necessary if [[ "$src" -nt "$tdst" ]]; then # remove is necessary to be done and not use -f in ln # because this create buggy relative symlink in some case. # there is fix around this in next coreutils [[ -e "$tdst" ]] && rm -f -v "$tdst" # don't use harlink, to be able to easily remove package by date # removing a directory by date, will remove symlink in the clean pass ln -v -r -s "$src" "$tdst" fi if [[ "$src" -nt "$fdst" ]]; then [[ -e "$fdst" ]] && rm -f -v "$fdst" ln -v -r -s "$src" "$fdst" fi done # disallow listing of PKGFLAT. Too much file echo 'No listing allowed here.' > "$BASE/$PKGFLAT/index.html" echo ":: removing empty directories in ${BASE##*/}" find "$BASE" -type d -empty -delete -print touch "$BASE" "$BASE/$PKGFLAT" # vim:set sw=2 ts=2 ft=sh et:
arm-sync→repo-rsync +3 −17 Original line number Diff line number Diff line Loading @@ -20,10 +20,10 @@ UPSTREAM='rsync://pkgbuild.com/packages/' LOCKFILE=~/."${0##*/}".lock ARMBASE=/srv/ftp/archlinux/arm BASE=/srv/ftp/archlinux/archive/repos SNAPR="$(date +%Y/%m/%d)" SNAP="$ARMBASE/$SNAPR" LAST="$ARMBASE/last" SNAP="$BASE/$SNAPR" LAST="$(ls -1d "$BASE"/*/*/*|sort|tail -n1)" # we lock! exec 9> "$LOCKFILE" Loading @@ -42,18 +42,4 @@ rsync -rltH --link-dest="$LAST/" --exclude '*/.*' "$UPSTREAM" "$SNAP/" # only to have a quick check of sync in listdir touch "$SNAP" # update last symlink only when last rsync is successful (bash -e) ln -snf "$SNAPR" "$LAST" # update package list if type -P arm-link &>/dev/null; then arm-link "$LAST/" >/dev/null fi # use hardlink to optimize space usage # currently disabled because hardlink segfault #if type -P hardlink &>/dev/null; then # hardlink "$ARMBASE" >/dev/null || true #fi # vim:set sw=2 ts=2 ft=sh et:
