diff options
| -rwxr-xr-x | any-to-ours | 78 | ||||
| -rwxr-xr-x | create-repo | 18 | ||||
| -rwxr-xr-x | cron-jobs/check_archlinux/parse_pkgbuilds.sh | 10 | ||||
| -rwxr-xr-x | cron-jobs/devlist-mailer | 6 | ||||
| -rwxr-xr-x | db-list-unsigned-packages | 4 | ||||
| -rwxr-xr-x | mkrepo | 8 |
6 files changed, 62 insertions, 62 deletions
diff --git a/any-to-ours b/any-to-ours index e2458ca..4ba01dc 100755 --- a/any-to-ours +++ b/any-to-ours @@ -2,9 +2,9 @@ # Releases 'any' packages from Arch arches to ours trap_exit() { - echo - error "$@" - exit 1 + echo + error "$@" + exit 1 } source "$(dirname "$(readlink -e "$0")")/config" @@ -22,51 +22,51 @@ BASEARCH='x86_64' # Traverse all Arch repos for _repo in ${ARCHREPOS[@]}; do - msg "Processing ${_repo}..." + msg "Processing ${_repo}..." -# Find 'any' packages -# This is hardcoded but it could release other arches... - PKGS=($(find "${FTP_BASE}/${_repo}/os/${BASEARCH}/" \ - -iname '*-any.pkg.tar.?z' \ - -printf "%f ")) + # Find 'any' packages + # This is hardcoded but it could release other arches... + PKGS=($(find "${FTP_BASE}/${_repo}/os/${BASEARCH}/" \ + -iname '*-any.pkg.tar.?z' \ + -printf "%f ")) - if [ ${#PKGS[@]} -eq 0 ]; then - msg2 "No 'any' packages here" - continue - fi + if [ ${#PKGS[@]} -eq 0 ]; then + msg2 "No 'any' packages here" + continue + fi - for _arch in ${OURARCHES[@]}; do - msg2 "Syncing ${_arch}..." + for _arch in ${OURARCHES[@]}; do + msg2 "Syncing ${_arch}..." -# Sync 'any' only and extract the synced packages - SYNCED=($( - rsync -av \ - --include='*-any.pkg.tar.?z' \ - --include='*-any.pkg.tar.?z.sig' \ - --exclude='*' \ - ${FTP_BASE}/${_repo}/os/${BASEARCH}/ \ - ${FTP_BASE}/${_repo}/os/${_arch}/ 2>&1 | \ - grep 'any\.pkg\.tar\..z$' | \ - cut -d ' ' -f 1 )) + # Sync 'any' only and extract the synced packages + SYNCED=($( + rsync -av \ + --include='*-any.pkg.tar.?z' \ + --include='*-any.pkg.tar.?z.sig' \ + --exclude='*' \ + ${FTP_BASE}/${_repo}/os/${BASEARCH}/ \ + ${FTP_BASE}/${_repo}/os/${_arch}/ 2>&1 | \ + grep 'any\.pkg\.tar\..z$' | \ + cut -d ' ' -f 1 )) - if [ ${#SYNCED[@]} -eq 0 ]; then - msg2 "Already synced (or error happened)" - continue - fi + if [ ${#SYNCED[@]} -eq 0 ]; then + msg2 "Already synced (or error happened)" + continue + fi - msg2 "Synced ${#SYNCED[@]} packages: ${SYNCED[@]}" + msg2 "Synced ${#SYNCED[@]} packages: ${SYNCED[@]}" - msg2 "Adding to db..." + msg2 "Adding to db..." - pushd ${FTP_BASE}/${_repo}/os/${_arch}/ >/dev/null + pushd ${FTP_BASE}/${_repo}/os/${_arch}/ >/dev/null -# Add the packages to the db - repo-add ${_repo}${DBEXT} \ - ${SYNCED[@]} + # Add the packages to the db + repo-add ${_repo}${DBEXT} \ + ${SYNCED[@]} - popd >/dev/null + popd >/dev/null -# Avoid mixups - unset SYNCED PKGS - done + # Avoid mixups + unset SYNCED PKGS + done done diff --git a/create-repo b/create-repo index 1ec9798..cfdbc23 100755 --- a/create-repo +++ b/create-repo @@ -5,20 +5,20 @@ . "$(dirname "$(readlink -e "$0")")/db-functions" if [ $# -eq 0 ]; then - msg "Usage: ${0##*/} repo1 [repo2 ... repoX]" - exit 1 + msg "Usage: ${0##*/} repo1 [repo2 ... repoX]" + exit 1 fi msg "Creating repos..." for _repo in "$@"; do - msg2 "Creating [${_repo}]" - mkdir -p "${FTP_BASE}/staging/${_repo}" || \ - error "Failed creating staging dir" + msg2 "Creating [${_repo}]" + mkdir -p "${FTP_BASE}/staging/${_repo}" || \ + error "Failed creating staging dir" - for _arch in "${ARCHES[@]}"; do - mkdir -p "${FTP_BASE}/${_repo}/os/${_arch}" || \ - error "Failed creating ${_arch} dir" - done + for _arch in "${ARCHES[@]}"; do + mkdir -p "${FTP_BASE}/${_repo}/os/${_arch}" || \ + error "Failed creating ${_arch} dir" + done done msg "Don't forget to add them to the PKGREPOS array on %s/config" "$(dirname "$(readlink -e "$0")")" diff --git a/cron-jobs/check_archlinux/parse_pkgbuilds.sh b/cron-jobs/check_archlinux/parse_pkgbuilds.sh index 38af179..b857ac8 100755 --- a/cron-jobs/check_archlinux/parse_pkgbuilds.sh +++ b/cron-jobs/check_archlinux/parse_pkgbuilds.sh @@ -118,11 +118,11 @@ source_pkgbuild() { } find_pkgbuilds() { - #Skip over some dirs - local d="${1##*/}" - if [ "$d" = "CVS" -o "$d" = ".svn" ]; then - return - fi + #Skip over some dirs + local d="${1##*/}" + if [ "$d" = "CVS" -o "$d" = ".svn" ]; then + return + fi if [ -f "$1/PKGBUILD" ]; then source_pkgbuild "$1" diff --git a/cron-jobs/devlist-mailer b/cron-jobs/devlist-mailer index 61cd32c..1a05521 100755 --- a/cron-jobs/devlist-mailer +++ b/cron-jobs/devlist-mailer @@ -8,18 +8,18 @@ FROM="repomaint@archlinux.org" SUBJECT="Repository Maintenance $(date +"%d-%m-%Y")" if [ $# -ge 1 ]; then - SUBJECT="$1 $(date +"%d-%m-%Y")" + SUBJECT="$1 $(date +"%d-%m-%Y")" fi if [ $# -ge 2 ]; then - LIST="$2" + LIST="$2" fi stdin="$(cat)" #echo used to strip whitespace for checking for actual data if [ -n "$(echo $stdin)" ]; then -echo "Subject: $SUBJECT + echo "Subject: $SUBJECT To: $LIST From: $FROM diff --git a/db-list-unsigned-packages b/db-list-unsigned-packages index f593686..c88203b 100755 --- a/db-list-unsigned-packages +++ b/db-list-unsigned-packages @@ -33,6 +33,6 @@ shift for repo in "${PKGREPOS[@]}" do - db="${FTP_BASE}/${repo}/os/${arch}/${repo}.db" - [ -f "$db" ] && "$(dirname "$(readlink -e "$0")")/db-list-unsigned-packages.py" "$repo" "$@" < "$db" + db="${FTP_BASE}/${repo}/os/${arch}/${repo}.db" + [ -f "$db" ] && "$(dirname "$(readlink -e "$0")")/db-list-unsigned-packages.py" "$repo" "$@" < "$db" done @@ -6,10 +6,10 @@ source "$(dirname "$(readlink -e "$0")")/config" for repo in "$@"; do - echo ":: Creating [$repo]" - for arch in "${ARCHES[@]}"; do - mkdir -pv "${FTP_BASE}/${repo}/os/${arch}" - done + echo ":: Creating [$repo]" + for arch in "${ARCHES[@]}"; do + mkdir -pv "${FTP_BASE}/${repo}/os/${arch}" + done done echo ":: All done. Add the repo to the ParabolaWeb admin page." |