From 439bd2112c01bc9b185d2552aa0888d7055929e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Fri, 18 Feb 2011 20:43:56 -0300
Subject: First stab at sourceballing everything

---
 cron-jobs/sourceballs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index b55de05..0df007e 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -63,10 +63,11 @@ for repo in ${PKGREPOS[@]}; do
 		if grep -Fqx "${pkgbase}" "${dirname}/sourceballs.skip"; then
 			continue
 		fi
+        # Commenting out, we'll sourceball everything
 		# Check if the license or .force file does not enforce creating a source package
-		if ! (chk_license ${pkglicense[@]} || grep -Fqx "${pkgbase}" "${dirname}/sourceballs.force"); then
-			continue
-		fi
+#		if ! (chk_license ${pkglicense[@]} || grep -Fqx "${pkgbase}" "${dirname}/sourceballs.force"); then
+#			continue
+#		fi
 		# Store the expected file name of the source package
 		echo "${pkgbase}-${pkgver}${SRCEXT}" >> "${WORKDIR}/expected-src-pkgs"
 
@@ -79,8 +80,10 @@ for repo in ${PKGREPOS[@]}; do
 
 			# Get the sources from svn
 			mkdir -p "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}"
-			svn export -q "${SVNREPO}/${pkgbase}/repos/${repo}-${pkgarch}" \
-				"${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null 2>&1
+			#svn export -q "${SVNREPO}/${pkgbase}/repos/${repo}-${pkgarch}" \
+			#	"${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null 2>&1
+            cp -r "${SVNREPO}/libre/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1 || \
+            cp -r "${SVNREPO}/libre-testing/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1
 			if [ $? -ge 1 ]; then
 				failedpkgs[${#failedpkgs[*]}]="${pkgbase}-${pkgver}${SRCEXT}"
 				continue
-- 
cgit v1.2.3-2-g168b


From f8c49cc2915f66b53bd9dd248b41ab6a96c1059a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Sun, 20 Feb 2011 22:09:28 -0300
Subject: Changes to sourceball everything

---
 cron-jobs/sourceballs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 0df007e..5726484 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -21,10 +21,10 @@ renice +10 -p $$ > /dev/null
 for repo in ${PKGREPOS[@]}; do
 	for arch in ${ARCHES[@]}; do
 		# Repo does not exist; skip it
-		if [ ! -f "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" ]; then
+		if [ ! -f "${ARCH_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" ]; then
 			continue
 		fi
-		bsdtar -xOf "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" \
+		bsdtar -xOf "${ARCH_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" \
 			| awk '/^%NAME%/ { getline b };
 				/^%BASE%/ { getline b };
 				/^%VERSION%/ { getline v };
@@ -46,7 +46,7 @@ for repo in ${PKGREPOS[@]}; do
 done
 
 # Create a list of all available source package file names
-find "${FTP_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs"
+find "${ARCH_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs"
 
 # Check for all packages if we need to build a source package
 for repo in ${PKGREPOS[@]}; do
@@ -59,7 +59,7 @@ for repo in ${PKGREPOS[@]}; do
 		pkgarch=${pkginfo[2]}
 		pkglicense=(${pkginfo[@]:3})
 
-		# Should this package be skipped?
+		# Should this packages be skipped?
 		if grep -Fqx "${pkgbase}" "${dirname}/sourceballs.skip"; then
 			continue
 		fi
@@ -82,6 +82,9 @@ for repo in ${PKGREPOS[@]}; do
 			mkdir -p "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}"
 			#svn export -q "${SVNREPO}/${pkgbase}/repos/${repo}-${pkgarch}" \
 			#	"${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null 2>&1
+
+            # If it's on official repos, nor [libre], nor [libre-testing]
+            cp -r "${SVNREPO}/$repo/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1 || \
             cp -r "${SVNREPO}/libre/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1 || \
             cp -r "${SVNREPO}/libre-testing/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1
 			if [ $? -ge 1 ]; then
@@ -93,7 +96,7 @@ for repo in ${PKGREPOS[@]}; do
 			pushd "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null
 			makepkg --nocolor --allsource --ignorearch >/dev/null 2>&1
 			if [ $? -eq 0 ] && [ -f "${pkgbase}-${pkgver}${SRCEXT}" ]; then
-				mv "${pkgbase}-${pkgver}${SRCEXT}" "${FTP_BASE}/${SRCPOOL}"
+				mv "${pkgbase}-${pkgver}${SRCEXT}" "${ARCH_BASE}/${SRCPOOL}"
 				# Avoid creating the same source package for every arch
 				echo "${pkgbase}-${pkgver}${SRCEXT}" >> "${WORKDIR}/available-src-pkgs"
 				newpkgs[${#newpkgs[*]}]="${pkgbase}-${pkgver}${SRCEXT}"
@@ -129,7 +132,7 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	for old_pkg in ${old_pkgs[@]}; do
 		msg2 "${old_pkg}"
 		if ! ${SOURCE_CLEANUP_DRYRUN}; then
-			mv "$FTP_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}"
+			mv "$ARCH_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}"
 			touch "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
 		fi
 	done
-- 
cgit v1.2.3-2-g168b


From c6516eca2803b780a01a6b2bf3e081c8bd570301 Mon Sep 17 00:00:00 2001
From: Parabola <parabolavnx@lions.dreamhost.com>
Date: Sun, 20 Feb 2011 17:10:40 -0800
Subject: sourceballs

---
 cron-jobs/sourceballs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 0df007e..53d43ce 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -21,10 +21,10 @@ renice +10 -p $$ > /dev/null
 for repo in ${PKGREPOS[@]}; do
 	for arch in ${ARCHES[@]}; do
 		# Repo does not exist; skip it
-		if [ ! -f "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" ]; then
+		if [ ! -f "${ARCH_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" ]; then
 			continue
 		fi
-		bsdtar -xOf "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" \
+		bsdtar -xOf "${ARCH_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" \
 			| awk '/^%NAME%/ { getline b };
 				/^%BASE%/ { getline b };
 				/^%VERSION%/ { getline v };
@@ -46,7 +46,7 @@ for repo in ${PKGREPOS[@]}; do
 done
 
 # Create a list of all available source package file names
-find "${FTP_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs"
+find "${ARCH_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs"
 
 # Check for all packages if we need to build a source package
 for repo in ${PKGREPOS[@]}; do
@@ -91,9 +91,9 @@ for repo in ${PKGREPOS[@]}; do
 
 			# Build the actual source package
 			pushd "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null
-			makepkg --nocolor --allsource --ignorearch >/dev/null 2>&1
+			makepkg --nocolor --allsource --ignorearch # >/dev/null 2>&1
 			if [ $? -eq 0 ] && [ -f "${pkgbase}-${pkgver}${SRCEXT}" ]; then
-				mv "${pkgbase}-${pkgver}${SRCEXT}" "${FTP_BASE}/${SRCPOOL}"
+				mv "${pkgbase}-${pkgver}${SRCEXT}" "${ARCH_BASE}/${SRCPOOL}"
 				# Avoid creating the same source package for every arch
 				echo "${pkgbase}-${pkgver}${SRCEXT}" >> "${WORKDIR}/available-src-pkgs"
 				newpkgs[${#newpkgs[*]}]="${pkgbase}-${pkgver}${SRCEXT}"
@@ -129,7 +129,7 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	for old_pkg in ${old_pkgs[@]}; do
 		msg2 "${old_pkg}"
 		if ! ${SOURCE_CLEANUP_DRYRUN}; then
-			mv "$FTP_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}"
+			mv "$ARCH_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}"
 			touch "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
 		fi
 	done
-- 
cgit v1.2.3-2-g168b


From cf2baeb05af80a849bfc2192f3af1e741e50745d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Sat, 5 Mar 2011 01:25:40 -0300
Subject: sourceballs2 creates sourceballs from the entire ABSLibre

---
 cron-jobs/sourceballs2 | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 cron-jobs/sourceballs2

(limited to 'cron-jobs')

diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
new file mode 100644
index 0000000..ba35298
--- /dev/null
+++ b/cron-jobs/sourceballs2
@@ -0,0 +1,81 @@
+#!/bin/bash
+# Steps
+# Traverse ABSLibre
+# Makepkg --allsource every package
+# Remove the old sourceballs
+
+dirname="$(dirname $(readlink -e $0))"
+. "${dirname}/../db-functions"
+. "${dirname}/../config"
+. "${MAKEPKGCONF}"
+
+pushd "${WORKDIR}" >/dev/null
+
+script_lock
+
+#adjust the nice level to run at a lower priority
+renice +10 -p $$ > /dev/null
+
+# Create a list of all available source package file names
+find "${ARCH_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs"
+
+pushd "${SVNREPO}" >/dev/null
+
+failedpkgs=()
+for repo in ${PKGREPOS[@]}; do
+    pushd $repo >/dev/null
+    find . -maxdepth 1 -type d | while read pkg; do
+        pushd "${SVNREPO}/$repo/$pkg" >/dev/null
+
+        [[ ! -e PKGBUILD ]] && {
+            warning "$repo/$pkg is not a package"
+            continue
+        }
+
+        unset pkgbase pkgname
+        source PKGBUILD
+        pkgbase=${pkgbase:-$pkgname}
+
+		echo "${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" >> "${WORKDIR}/expected-src-pkgs"
+
+        # Skip already sourceballed
+        [[ -e "${SRCPKGDEST}/${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" ]] && \
+            continue
+
+        makepkg --allsource --ignorearch -c
+
+        [[ $? -ne 0 ]] && \
+            failedpkgs[${#failedpkgs[*]}]="${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}"
+
+    done
+    popd >/dev/null
+done
+
+# Cleanup old source packages
+cat "${WORKDIR}/expected-src-pkgs" | sort -u > "${WORKDIR}/expected-src-pkgs.sort"
+cat "${WORKDIR}/available-src-pkgs" | sort -u > "${WORKDIR}/available-src-pkgs.sort"
+old_pkgs=($(comm -23 "${WORKDIR}/available-src-pkgs.sort" "${WORKDIR}/expected-src-pkgs.sort"))
+
+if [ ${#old_pkgs[@]} -ge 1 ]; then
+	msg "Removing old source packages..."
+	${SOURCE_CLEANUP_DRYRUN} && warning 'dry run mode is active'
+	for old_pkg in ${old_pkgs[@]}; do
+		msg2 "${old_pkg}"
+		if ! ${SOURCE_CLEANUP_DRYRUN}; then
+			mv "$ARCH_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}"
+			touch "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
+		fi
+	done
+fi
+
+old_pkgs=($(find ${SOURCE_CLEANUP_DESTDIR} -type f -name "*${SRCEXT}" -mtime +${SOURCE_CLEANUP_KEEP} -printf '%f\n'))
+if [ ${#old_pkgs[@]} -ge 1 ]; then
+	msg "Removing old source packages from the cleanup directory..."
+	for old_pkg in ${old_pkgs[@]}; do
+		msg2 "${old_pkg}"
+		${SOURCE_CLEANUP_DRYRUN} || rm -f "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
+	done
+fi
+
+script_unlock
+
-- 
cgit v1.2.3-2-g168b


From 229a9c504cbd733c93cf91399dc54bedf5160cc5 Mon Sep 17 00:00:00 2001
From: Parabola <parabolavnx@lions.dreamhost.com>
Date: Sun, 6 Mar 2011 15:22:21 -0800
Subject: Fixes

---
 cron-jobs/sourceballs2 | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100755 cron-jobs/sourceballs2

(limited to 'cron-jobs')

diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
new file mode 100755
index 0000000..452208e
--- /dev/null
+++ b/cron-jobs/sourceballs2
@@ -0,0 +1,87 @@
+#!/bin/bash
+
+dirname="$(dirname $(readlink -e $0))"
+. "${dirname}/../db-functions"
+. "${dirname}/../config"
+. "${MAKEPKGCONF}"
+
+pushd "${WORKDIR}" >/dev/null
+
+script_lock
+
+#adjust the nice level to run at a lower priority
+renice +10 -p $$ > /dev/null
+
+# Create a list of all available source package file names
+find "${ARCH_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs"
+
+# Steps
+# Traverse the ABSLibre
+# Makepkg --allsource every package
+# Remove the old packages
+pushd "${SVNREPO}" >/dev/null
+
+failedpkgs=()
+for repo in ${PKGREPOS[@]}; do
+    pushd $repo >/dev/null
+    find . -maxdepth 1 -type d | while read pkg; do
+        pushd "${SVNREPO}/$repo/$pkg" >/dev/null
+
+        [[ ! -e PKGBUILD ]] && {
+            warning "$repo/$pkg is not a package"
+            continue
+        }
+
+        unset pkgbase pkgname
+        source PKGBUILD
+        pkgbase=${pkgbase:-$pkgname}
+
+		echo "${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" >> "${WORKDIR}/expected-src-pkgs"
+
+        # Skip already sourceballed
+        [[ -e "${SRCPKGDEST}/${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" ]] && \
+            continue
+
+        makepkg --allsource --ignorearch -c >/dev/null 2>&1
+
+        [[ $? -ne 0 ]] && \
+            failedpkgs[${#failedpkgs[*]}]="${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}"
+
+    done
+    popd >/dev/null
+done
+
+# Cleanup old source packages
+cat "${WORKDIR}/expected-src-pkgs" | sort -u > "${WORKDIR}/expected-src-pkgs.sort"
+cat "${WORKDIR}/available-src-pkgs" | sort -u > "${WORKDIR}/available-src-pkgs.sort"
+old_pkgs=($(comm -23 "${WORKDIR}/available-src-pkgs.sort" "${WORKDIR}/expected-src-pkgs.sort"))
+
+if [ ${#old_pkgs[@]} -ge 1 ]; then
+	msg "Removing old source packages..."
+	${SOURCE_CLEANUP_DRYRUN} && warning 'dry run mode is active'
+	for old_pkg in ${old_pkgs[@]}; do
+		msg2 "${old_pkg}"
+		if ! ${SOURCE_CLEANUP_DRYRUN}; then
+			mv "$ARCH_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}"
+			touch "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
+		fi
+	done
+fi
+
+old_pkgs=($(find ${SOURCE_CLEANUP_DESTDIR} -type f -name "*${SRCEXT}" -mtime +${SOURCE_CLEANUP_KEEP} -printf '%f\n'))
+if [ ${#old_pkgs[@]} -ge 1 ]; then
+	msg "Removing old source packages from the cleanup directory..."
+	for old_pkg in ${old_pkgs[@]}; do
+		msg2 "${old_pkg}"
+		${SOURCE_CLEANUP_DRYRUN} || rm -f "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
+	done
+fi
+
+msg "Failed"
+for _fail in ${failedpkgs[@]}; do
+    msg2 "$_fail"
+done
+       
+
+script_unlock
+
-- 
cgit v1.2.3-2-g168b


From 6ce3ddee58415e052ec578e777994a60c7e4c3a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Sun, 17 Apr 2011 03:11:36 -0300
Subject: sourceballs2

---
 cron-jobs/sourceballs2 | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index ba35298..b70f417 100644
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -21,8 +21,9 @@ find "${ARCH_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort
 
 pushd "${SVNREPO}" >/dev/null
 
-failedpkgs=()
 for repo in ${PKGREPOS[@]}; do
+    failedpkgs=()
+
     pushd $repo >/dev/null
     find . -maxdepth 1 -type d | while read pkg; do
         pushd "${SVNREPO}/$repo/$pkg" >/dev/null
@@ -42,13 +43,23 @@ for repo in ${PKGREPOS[@]}; do
         [[ -e "${SRCPKGDEST}/${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" ]] && \
             continue
 
+        msg2 "$pkgbase-$pkgver-$pkgrel..."
         makepkg --allsource --ignorearch -c
 
-        [[ $? -ne 0 ]] && \
+        [[ $? -ne 0 ]] && {
+            warning "Failed."
             failedpkgs[${#failedpkgs[*]}]="${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}"
+        }
 
     done
     popd >/dev/null
+
+    if [ ${#failedpkgs[@]} -ge 1 ]; then
+        msg "Failed to create source packages for [${repo}]..."
+        for failed_pkg in ${failedpkgs[@]}; do
+            msg2 "${failed_pkg}"
+        done
+    fi
 done
 
 # Cleanup old source packages
-- 
cgit v1.2.3-2-g168b


From 91210f8ae18f5651ace2273cfa0c8ad7e4dbcbdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Sat, 16 Jul 2011 03:35:37 -0300
Subject: Syncs ABSLibre tarballs between ABSLibre host and repo server

---
 cron-jobs/update-abs-tarballs | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 cron-jobs/update-abs-tarballs

(limited to 'cron-jobs')

diff --git a/cron-jobs/update-abs-tarballs b/cron-jobs/update-abs-tarballs
new file mode 100644
index 0000000..9990f20
--- /dev/null
+++ b/cron-jobs/update-abs-tarballs
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+. "$(dirname $0)/../config"
+
+rsync -av parabolagnulinux.org::abstar/ ${FTP_BASE}/
+
+exit $?
-- 
cgit v1.2.3-2-g168b


From c1858e5d04ebe2b8c2c45ff71dc8bcfb05b49dd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Tue, 9 Aug 2011 21:46:24 -0300
Subject: update-abs-tarballs +x

---
 cron-jobs/update-abs-tarballs | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 cron-jobs/update-abs-tarballs

(limited to 'cron-jobs')

diff --git a/cron-jobs/update-abs-tarballs b/cron-jobs/update-abs-tarballs
old mode 100644
new mode 100755
-- 
cgit v1.2.3-2-g168b


From 67c5e5b37efa306c92644922fad65adbb127a4bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Tue, 9 Aug 2011 21:49:27 -0300
Subject: Ignore staging

---
 cron-jobs/update-abs-tarballs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/update-abs-tarballs b/cron-jobs/update-abs-tarballs
index 9990f20..824ac34 100755
--- a/cron-jobs/update-abs-tarballs
+++ b/cron-jobs/update-abs-tarballs
@@ -2,6 +2,6 @@
 
 . "$(dirname $0)/../config"
 
-rsync -av parabolagnulinux.org::abstar/ ${FTP_BASE}/
+rsync -av --exclude=staging/ parabolagnulinux.org::abstar/ ${FTP_BASE}/
 
 exit $?
-- 
cgit v1.2.3-2-g168b


From 986fbe51101674c290df8f5c9d0dc3f507c172e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Thu, 11 Aug 2011 20:45:29 -0300
Subject: Script to solve issue165

---
 cron-jobs/repo-sanity-check | 46 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 cron-jobs/repo-sanity-check

(limited to 'cron-jobs')

diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
new file mode 100644
index 0000000..a6249b5
--- /dev/null
+++ b/cron-jobs/repo-sanity-check
@@ -0,0 +1,46 @@
+#!/bin/bash
+# Solves issue165
+
+. "$(dirname $0)/../db-functions"
+. "$(dirname $0)/../config"
+
+# Traverse all repos
+for _repo in ${REPOS[@]}; do
+
+# Find all pkgnames on this repo's abs
+    on_abs=($(
+        find ${SVNREPO}/${_repo} -name PKGBUILD | \
+        while read pkgbuild; do
+            source ${pkgbuild} >/dev/null 2>&1
+# cleanup to save memory
+            unset build package source md5sums pkgdesc pkgver pkgrel epoch \
+                  url license arch depends makedepends optdepends options \
+                  >/dev/null 2>&1
+
+# also cleanup package functions
+            for _pkg in ${pkgname[@]}; do
+                unset package_${pkg} >/dev/null 2>&1
+            done
+            
+# this fills the on_abs array
+            echo ${pkgname[@]}
+        done
+    ))
+
+# Find all pkgnames on repos
+    on_repo=($(
+        find ${FTP_BASE}/${_repo} -name "*.pkg.tar.?z" -printf "%f\n" | \
+        sed "s/^\(.\+\)-[^-]\+-[^-]\+-[^-]\+$/\1/"
+    ))
+
+# Compares them, whatever is on repos but not on abs should be removed
+    remove=($(comm -13 <(echo ${on_abs[@]} | tr ' ' "\n" | sort) \
+             <(echo ${on_repo[@]} | tr ' ' "\n" | sort)))
+
+# Remove them from databases, ftpdir-cleanup will take care of the rest
+    find ${FTP_BASE}/${_repo} -name "*.db.tar.?z" -print0 | \
+        xargs -0 repo-remove {} ${remove[@]}
+
+done
+
+exit $?
-- 
cgit v1.2.3-2-g168b


From d1de884ad56e0756a80d5c00bb723e7f2a56491b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Thu, 11 Aug 2011 21:37:21 -0300
Subject: Changed xargs for find -exec

---
 cron-jobs/repo-sanity-check | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index a6249b5..52ca33b 100644
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -38,8 +38,8 @@ for _repo in ${REPOS[@]}; do
              <(echo ${on_repo[@]} | tr ' ' "\n" | sort)))
 
 # Remove them from databases, ftpdir-cleanup will take care of the rest
-    find ${FTP_BASE}/${_repo} -name "*.db.tar.?z" -print0 | \
-        xargs -0 repo-remove {} ${remove[@]}
+    find ${FTP_BASE}/${_repo} -name "*.db.tar.?z" -exec \
+        repo-remove {} ${remove[@]} \;
 
 done
 
-- 
cgit v1.2.3-2-g168b


From 1d7db341d4f27f8ebd7167a8630ea8589e40c464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Thu, 11 Aug 2011 21:39:05 -0300
Subject: Forgot +x

---
 cron-jobs/repo-sanity-check | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 cron-jobs/repo-sanity-check

(limited to 'cron-jobs')

diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
old mode 100644
new mode 100755
-- 
cgit v1.2.3-2-g168b


From d2f65c340f890050c99371e203288afea03d125b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Thu, 11 Aug 2011 22:42:01 -0300
Subject: Sort unique pkgnames

---
 cron-jobs/repo-sanity-check | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index 52ca33b..690a9f8 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -34,8 +34,8 @@ for _repo in ${REPOS[@]}; do
     ))
 
 # Compares them, whatever is on repos but not on abs should be removed
-    remove=($(comm -13 <(echo ${on_abs[@]} | tr ' ' "\n" | sort) \
-             <(echo ${on_repo[@]} | tr ' ' "\n" | sort)))
+    remove=($(comm -13 <(echo ${on_abs[@]} | tr ' ' "\n" | sort -u) \
+             <(echo ${on_repo[@]} | tr ' ' "\n" | sort -u)))
 
 # Remove them from databases, ftpdir-cleanup will take care of the rest
     find ${FTP_BASE}/${_repo} -name "*.db.tar.?z" -exec \
-- 
cgit v1.2.3-2-g168b


From 7d6595c750903114740c7ab726cd89cb73d6c3a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Fri, 12 Aug 2011 02:37:50 -0300
Subject: Fixed unexistent REPOS array and skip removal when the ABS tree is
 empty.

---
 cron-jobs/repo-sanity-check | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index 690a9f8..92b26ae 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -5,7 +5,7 @@
 . "$(dirname $0)/../config"
 
 # Traverse all repos
-for _repo in ${REPOS[@]}; do
+for _repo in ${PKGREPOS[@]}; do
 
 # Find all pkgnames on this repo's abs
     on_abs=($(
@@ -27,6 +27,12 @@ for _repo in ${REPOS[@]}; do
         done
     ))
 
+# quit if abs is empty
+    if [ ${#on_abs[*]} -eq 0 ]; then
+        warning "[${_repo}]'s ABS tree is empty, skipping"
+        break
+    fi
+
 # Find all pkgnames on repos
     on_repo=($(
         find ${FTP_BASE}/${_repo} -name "*.pkg.tar.?z" -printf "%f\n" | \
-- 
cgit v1.2.3-2-g168b


From a032c1fad3e2d57a7a1b7cef65d90ea06a766784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Sat, 13 Aug 2011 12:42:42 -0300
Subject: Cleaner sourceballs2

---
 cron-jobs/sourceballs2 | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index b29b396..a43d71e 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -33,24 +33,28 @@ for repo in ${PKGREPOS[@]}; do
             continue
         }
 
-        unset pkgbase pkgname
+# Unset the previous data
+        unset pkgbase pkgname pkgver pkgrel
         source PKGBUILD
+
+        unset build package url pkgdesc source md5sums depends makedepends \
+              optdepends license arch options check mksource
+
+        for _pkg in ${pkgname[@]}; do
+            unset package_${_pkg} >/dev/null 2>&1
+        done
+
         pkgbase=${pkgbase:-$pkgname}
+        srcfile="${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}"
 
-		echo "${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" >> "${WORKDIR}/expected-src-pkgs"
+		echo "${srcfile}" >> "${WORKDIR}/expected-src-pkgs"
 
         # Skip already sourceballed
-        [[ -e "${SRCPKGDEST}/${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" ]] && \
-            continue
+        [ -e "${SRCPKGDEST}/${srcfile}" ] && continue
 
-        msg2 "$pkgbase-$pkgver-$pkgrel..."
-        makepkg --allsource --ignorearch -c
         makepkg --allsource --ignorearch -c >/dev/null 2>&1
 
-        [[ $? -ne 0 ]] && {
-            warning "Failed."
-            failedpkgs[${#failedpkgs[*]}]="${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}"
-        }
+        [ $? -ne 0 ] && failedpkgs+=("${srcfile}")
 
     done
     popd >/dev/null
@@ -89,10 +93,5 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	done
 fi
 
-msg "Failed"
-for _fail in ${failedpkgs[@]}; do
-    msg2 "$_fail"
-done
-
 script_unlock
 
-- 
cgit v1.2.3-2-g168b


From f23d7103fec259ebe2ba796ae7f351dfbda5b705 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Sat, 13 Aug 2011 12:51:32 -0300
Subject: Added useful messages

---
 cron-jobs/repo-sanity-check | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index 92b26ae..1ba90a6 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -6,6 +6,7 @@
 
 # Traverse all repos
 for _repo in ${PKGREPOS[@]}; do
+    msg "Cleaning up [${_repo}]"
 
 # Find all pkgnames on this repo's abs
     on_abs=($(
@@ -45,7 +46,10 @@ for _repo in ${PKGREPOS[@]}; do
 
 # Remove them from databases, ftpdir-cleanup will take care of the rest
     find ${FTP_BASE}/${_repo} -name "*.db.tar.?z" -exec \
-        repo-remove {} ${remove[@]} \;
+        repo-remove {} ${remove[@]} >/dev/null 2>&1 \;
+
+    msg2 "Removed the following packages:"
+    plain "$(echo ${remove[@]} | tr ' ' "\n")"
 
 done
 
-- 
cgit v1.2.3-2-g168b


From eac9e4d43cc33bf6671fdbd7f04e5bab387259d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Sat, 13 Aug 2011 13:15:35 -0300
Subject: Failedpkgs array wasn't working

---
 cron-jobs/sourceballs2 | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index a43d71e..5e228fc 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -22,10 +22,10 @@ find "${ARCH_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort
 pushd "${SVNREPO}" >/dev/null
 
 for repo in ${PKGREPOS[@]}; do
-    failedpkgs=()
+    msg "Sourceballing [${repo}]"
 
     pushd $repo >/dev/null
-    find . -maxdepth 1 -type d | while read pkg; do
+    find -maxdepth 1 -type d | while read pkg; do
         pushd "${SVNREPO}/$repo/$pkg" >/dev/null
 
         [[ ! -e PKGBUILD ]] && {
@@ -54,18 +54,12 @@ for repo in ${PKGREPOS[@]}; do
 
         makepkg --allsource --ignorearch -c >/dev/null 2>&1
 
-        [ $? -ne 0 ] && failedpkgs+=("${srcfile}")
+        [ $? -ne 0 ] && plain ${srcfile}
 
-    done
+    done # end find pkgs
     popd >/dev/null
 
-    if [ ${#failedpkgs[@]} -ge 1 ]; then
-        msg "Failed to create source packages for [${repo}]..."
-        for failed_pkg in ${failedpkgs[@]}; do
-            msg2 "${failed_pkg}"
-        done
-    fi
-done
+done # end repos
 
 # Cleanup old source packages
 cat "${WORKDIR}/expected-src-pkgs" | sort -u > "${WORKDIR}/expected-src-pkgs.sort"
-- 
cgit v1.2.3-2-g168b


From 59105fccf9f5866b451cdaf90052aa8c9346e5f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Sun, 8 Jan 2012 15:17:46 -0300
Subject: remove locks

---
 cron-jobs/ftpdir-cleanup | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index bb1661a..83e6e17 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -22,13 +22,6 @@ clean_pkg() {
 	fi
 }
 
-script_lock
-
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
-		repo_lock ${repo} ${arch} || exit 1
-	done
-done
 
 ${CLEANUP_DRYRUN} && warning 'dry run mode is active'
 
-- 
cgit v1.2.3-2-g168b


From 3e085d0d529a749386f826ecb2dd189df55b4833 Mon Sep 17 00:00:00 2001
From: Icarious <icarious@hacari.org>
Date: Mon, 26 Aug 2013 05:26:11 +0530
Subject: removed unnecessary code

---
 cron-jobs/sourceballs2 | 29 -----------------------------
 1 file changed, 29 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index 5e228fc..5644268 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -60,32 +60,3 @@ for repo in ${PKGREPOS[@]}; do
     popd >/dev/null
 
 done # end repos
-
-# Cleanup old source packages
-cat "${WORKDIR}/expected-src-pkgs" | sort -u > "${WORKDIR}/expected-src-pkgs.sort"
-cat "${WORKDIR}/available-src-pkgs" | sort -u > "${WORKDIR}/available-src-pkgs.sort"
-old_pkgs=($(comm -23 "${WORKDIR}/available-src-pkgs.sort" "${WORKDIR}/expected-src-pkgs.sort"))
-
-if [ ${#old_pkgs[@]} -ge 1 ]; then
-	msg "Removing old source packages..."
-	${SOURCE_CLEANUP_DRYRUN} && warning 'dry run mode is active'
-	for old_pkg in ${old_pkgs[@]}; do
-		msg2 "${old_pkg}"
-		if ! ${SOURCE_CLEANUP_DRYRUN}; then
-			mv "$ARCH_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}"
-			touch "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
-		fi
-	done
-fi
-
-old_pkgs=($(find ${SOURCE_CLEANUP_DESTDIR} -type f -name "*${SRCEXT}" -mtime +${SOURCE_CLEANUP_KEEP} -printf '%f\n'))
-if [ ${#old_pkgs[@]} -ge 1 ]; then
-	msg "Removing old source packages from the cleanup directory..."
-	for old_pkg in ${old_pkgs[@]}; do
-		msg2 "${old_pkg}"
-		${SOURCE_CLEANUP_DRYRUN} || rm -f "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
-	done
-fi
-
-script_unlock
-
-- 
cgit v1.2.3-2-g168b


From f65c477e42f46a3e22b5fbc5da790f9561483770 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Tue, 31 Dec 2013 14:50:37 -0500
Subject: clean up

---
 cron-jobs/ftpdir-cleanup | 7 +++++++
 cron-jobs/sourceballs    | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index a2823d4..e42a1a8 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -22,6 +22,13 @@ clean_pkg() {
 	fi
 }
 
+script_lock
+
+for repo in ${PKGREPOS[@]}; do
+	for arch in ${ARCHES[@]}; do
+		repo_lock ${repo} ${arch} || exit 1
+	done
+done
 
 ${CLEANUP_DRYRUN} && warning 'dry run mode is active'
 
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 91bc3d6..1542499 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -21,10 +21,10 @@ renice +10 -p $$ > /dev/null
 for repo in ${PKGREPOS[@]}; do
 	for arch in ${ARCHES[@]}; do
 		# Repo does not exist; skip it
-		if [ ! -f "${ARCH_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" ]; then
+		if [ ! -f "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" ]; then
 			continue
 		fi
-		bsdtar -xOf "${ARCH_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" \
+		bsdtar -xOf "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" \
 			| awk '/^%NAME%/ { getline b };
 				/^%BASE%/ { getline b };
 				/^%VERSION%/ { getline v };
@@ -46,7 +46,7 @@ for repo in ${PKGREPOS[@]}; do
 done
 
 # Create a list of all available source package file names
-find "${ARCH_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs"
+find "${FTP_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs"
 
 # Check for all packages if we need to build a source package
 for repo in ${PKGREPOS[@]}; do
@@ -59,7 +59,7 @@ for repo in ${PKGREPOS[@]}; do
 		pkgarch=${pkginfo[2]}
 		pkglicense=(${pkginfo[@]:3})
 
-		# Should this packages be skipped?
+		# Should this package be skipped?
 		if grep -Fqx "${pkgbase}" "${dirname}/sourceballs.skip"; then
 			continue
 		fi
-- 
cgit v1.2.3-2-g168b


From e210b136790f740a6eb42913b30f6d0c8557c81d Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Tue, 31 Dec 2013 14:53:28 -0500
Subject: get rid of $ARCH_BASE

---
 cron-jobs/sourceballs2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index 5644268..5b14d07 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -17,7 +17,7 @@ script_lock
 renice +10 -p $$ > /dev/null
 
 # Create a list of all available source package file names
-find "${ARCH_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs"
+find "${FTP_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs"
 
 pushd "${SVNREPO}" >/dev/null
 
-- 
cgit v1.2.3-2-g168b


From 6a093f1dc6bd5398115544dd229b520f9432e122 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Tue, 31 Dec 2013 15:49:06 -0500
Subject: use `readlink -e` on $0

---
 cron-jobs/integrity-check     | 2 +-
 cron-jobs/repo-sanity-check   | 4 ++--
 cron-jobs/sourceballs2        | 2 +-
 cron-jobs/update-abs-tarballs | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check
index f6c26cf..86a8f1d 100755
--- a/cron-jobs/integrity-check
+++ b/cron-jobs/integrity-check
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-dirname="$(dirname $0)"
+dirname="$(dirname "$(readlink -e "$0")")"
 
 . "${dirname}/../config"
 . "${dirname}/../db-functions"
diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index 1ba90a6..2aa7892 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -1,8 +1,8 @@
 #!/bin/bash
 # Solves issue165
 
-. "$(dirname $0)/../db-functions"
-. "$(dirname $0)/../config"
+. "$(dirname "$(readlink -e "$0")")/../db-functions"
+. "$(dirname "$(readlink -e "$0")")/../config"
 
 # Traverse all repos
 for _repo in ${PKGREPOS[@]}; do
diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index 5b14d07..bbe227d 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -4,7 +4,7 @@
 # Makepkg --allsource every package
 # Remove the old sourceballs
 
-dirname="$(dirname $(readlink -e $0))"
+dirname="$(dirname "$(readlink -e "$0")")"
 . "${dirname}/../db-functions"
 . "${dirname}/../config"
 . "${MAKEPKGCONF}"
diff --git a/cron-jobs/update-abs-tarballs b/cron-jobs/update-abs-tarballs
index 824ac34..901cc4b 100755
--- a/cron-jobs/update-abs-tarballs
+++ b/cron-jobs/update-abs-tarballs
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(dirname $0)/../config"
+. "$(dirname "$(readlink -e "$0")")/../config"
 
 rsync -av --exclude=staging/ parabolagnulinux.org::abstar/ ${FTP_BASE}/
 
-- 
cgit v1.2.3-2-g168b


From e7d2dcac7cf857fdccd82bec2bfc2a7d8e6b85c6 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 8 Jan 2014 16:53:56 -0500
Subject: Normalize to load ./config before loading ./db-functions

---
 cron-jobs/repo-sanity-check | 2 +-
 cron-jobs/sourceballs2      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index 2aa7892..ee4c061 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -1,8 +1,8 @@
 #!/bin/bash
 # Solves issue165
 
-. "$(dirname "$(readlink -e "$0")")/../db-functions"
 . "$(dirname "$(readlink -e "$0")")/../config"
+. "$(dirname "$(readlink -e "$0")")/../db-functions"
 
 # Traverse all repos
 for _repo in ${PKGREPOS[@]}; do
diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index bbe227d..1432bdf 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -5,8 +5,8 @@
 # Remove the old sourceballs
 
 dirname="$(dirname "$(readlink -e "$0")")"
-. "${dirname}/../db-functions"
 . "${dirname}/../config"
+. "${dirname}/../db-functions"
 . "${MAKEPKGCONF}"
 
 pushd "${WORKDIR}" >/dev/null
-- 
cgit v1.2.3-2-g168b


From 39fbf0d8d3cdc666912c597d41d5b6a70fc0c725 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 8 Jan 2014 20:53:38 -0500
Subject: Fix some array quoting.

---
 cron-jobs/check_archlinux/parse_pkgbuilds.sh | 22 +++++++++++-----------
 cron-jobs/ftpdir-cleanup                     | 12 ++++++------
 cron-jobs/repo-sanity-check                  |  4 ++--
 cron-jobs/sourceballs                        | 26 +++++++++++++-------------
 cron-jobs/sourceballs2                       |  4 ++--
 5 files changed, 34 insertions(+), 34 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/check_archlinux/parse_pkgbuilds.sh b/cron-jobs/check_archlinux/parse_pkgbuilds.sh
index 3f92169..c8d8618 100755
--- a/cron-jobs/check_archlinux/parse_pkgbuilds.sh
+++ b/cron-jobs/check_archlinux/parse_pkgbuilds.sh
@@ -6,18 +6,18 @@
 exit() { return; }
 
 splitpkg_overrides=('depends' 'optdepends' 'provides' 'conflicts')
-variables=('pkgname' 'pkgbase' 'epoch' 'pkgver' 'pkgrel' 'makedepends' 'arch' ${splitpkg_overrides[@]})
+variables=('pkgname' 'pkgbase' 'epoch' 'pkgver' 'pkgrel' 'makedepends' 'arch' "${splitpkg_overrides[@]}")
 readonly -a variables splitpkg_overrides
 
 backup_package_variables() {
-	for var in ${splitpkg_overrides[@]}; do
+	for var in "${splitpkg_overrides[@]}"; do
 		indirect="${var}_backup"
 		eval "${indirect}=(\${$var[@]})"
 	done
 }
 
 restore_package_variables() {
-	for var in ${splitpkg_overrides[@]}; do
+	for var in "${splitpkg_overrides[@]}"; do
 		indirect="${var}_backup"
 		if [ -n "${!indirect}" ]; then
 			eval "${var}=(\${$indirect[@]})"
@@ -42,31 +42,31 @@ print_info() {
 
 	if [ -n "$arch" ]; then
 		echo "%ARCH%"
-		for i in ${arch[@]}; do echo $i; done
+		for i in "${arch[@]}"; do echo $i; done
 		echo ""
 	fi
 	if [ -n "$depends" ]; then
 		echo "%DEPENDS%"
-		for i in ${depends[@]}; do
+		for i in "${depends[@]}"; do
 			echo $i
 		done
 		echo ""
 	fi
 	if [ -n "$makedepends" ]; then
 		echo "%MAKEDEPENDS%"
-		for i in ${makedepends[@]}; do
+		for i in "${makedepends[@]}"; do
 			echo $i
 		done
 		echo ""
 	fi
 	if [ -n "$conflicts" ]; then
 		echo "%CONFLICTS%"
-		for i in ${conflicts[@]}; do echo $i; done
+		for i in "${conflicts[@]}"; do echo $i; done
 		echo ""
 	fi
 	if [ -n "$provides" ]; then
 		echo "%PROVIDES%"
-		for i in ${provides[@]}; do echo $i; done
+		for i in "${provides[@]}"; do echo $i; done
 		echo ""
 	fi
 }
@@ -75,7 +75,7 @@ source_pkgbuild() {
 	ret=0
 	dir=$1
 	pkgbuild=$dir/PKGBUILD
-	for var in ${variables[@]}; do
+	for var in "${variables[@]}"; do
 		unset ${var}
 	done
 	source $pkgbuild &>/dev/null || ret=$?
@@ -88,7 +88,7 @@ source_pkgbuild() {
 
 	if [ "${#pkgname[@]}" -gt "1" ]; then
 		pkgbase=${pkgbase:-${pkgname[0]}}
-		for pkg in ${pkgname[@]}; do
+		for pkg in "${pkgname[@]}"; do
 			if [ "$(type -t package_${pkg})" != "function" ]; then
 				echo -e "%INVALID%\n$pkgbuild\n"
 				return 1
@@ -98,7 +98,7 @@ source_pkgbuild() {
 				while IFS= read -r line; do
 					var=${line%%=*}
 					var="${var#"${var%%[![:space:]]*}"}"   # remove leading whitespace characters
-					for realvar in ${variables[@]}; do
+					for realvar in "${variables[@]}"; do
 						if [ "$var" == "$realvar" ]; then
 							eval $line
 							break
diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index e42a1a8..ad2e7f9 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -24,16 +24,16 @@ clean_pkg() {
 
 script_lock
 
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		repo_lock ${repo} ${arch} || exit 1
 	done
 done
 
 ${CLEANUP_DRYRUN} && warning 'dry run mode is active'
 
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		if [ ! -f "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" ]; then
 			continue
 		fi
@@ -87,8 +87,8 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	done
 fi
 
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		repo_unlock ${repo} ${arch}
 	done
 done
diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index ee4c061..9d351df 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -5,7 +5,7 @@
 . "$(dirname "$(readlink -e "$0")")/../db-functions"
 
 # Traverse all repos
-for _repo in ${PKGREPOS[@]}; do
+for _repo in "${PKGREPOS[@]}"; do
     msg "Cleaning up [${_repo}]"
 
 # Find all pkgnames on this repo's abs
@@ -19,7 +19,7 @@ for _repo in ${PKGREPOS[@]}; do
                   >/dev/null 2>&1
 
 # also cleanup package functions
-            for _pkg in ${pkgname[@]}; do
+            for _pkg in "${pkgname[@]}"; do
                 unset package_${pkg} >/dev/null 2>&1
             done
             
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 1542499..329e135 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -7,8 +7,8 @@ pushd "${WORKDIR}" >/dev/null
 
 script_lock
 
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		repo_lock ${repo} ${arch} || exit 1
 	done
 done
@@ -18,8 +18,8 @@ renice +10 -p $$ > /dev/null
 
 # Create a readable file for each repo with the following format
 # <pkgbase|pkgname> <pkgver>-<pkgrel> <arch> <license>[ <license>]
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		# Repo does not exist; skip it
 		if [ ! -f "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" ]; then
 			continue
@@ -39,8 +39,8 @@ for repo in ${PKGREPOS[@]}; do
 	done | sort -u > "${WORKDIR}/db-${repo}"
 done
 
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		repo_unlock ${repo} ${arch}
 	done
 done
@@ -49,15 +49,15 @@ done
 find "${FTP_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs"
 
 # Check for all packages if we need to build a source package
-for repo in ${PKGREPOS[@]}; do
+for repo in "${PKGREPOS[@]}"; do
 	newpkgs=()
 	failedpkgs=()
 	while read line; do
-		pkginfo=(${line})
+		pkginfo=("${line}")
 		pkgbase=${pkginfo[0]}
 		pkgver=${pkginfo[1]}
 		pkgarch=${pkginfo[2]}
-		pkglicense=(${pkginfo[@]:3})
+		pkglicense=("${pkginfo[@]:3}")
 
 		# Should this package be skipped?
 		if grep -Fqx "${pkgbase}" "${dirname}/sourceballs.skip"; then
@@ -105,13 +105,13 @@ for repo in ${PKGREPOS[@]}; do
 
 	if [ ${#newpkgs[@]} -ge 1 ]; then
 		msg "Adding source packages for [${repo}]..."
-		for new_pkg in ${newpkgs[@]}; do
+		for new_pkg in "${newpkgs[@]}"; do
 			msg2 "${new_pkg}"
 		done
 	fi
 	if [ ${#failedpkgs[@]} -ge 1 ]; then
 		msg "Failed to create source packages for [${repo}]..."
-		for failed_pkg in ${failedpkgs[@]}; do
+		for failed_pkg in "${failedpkgs[@]}"; do
 			msg2 "${failed_pkg}"
 		done
 	fi
@@ -125,7 +125,7 @@ old_pkgs=($(comm -23 "${WORKDIR}/available-src-pkgs.sort" "${WORKDIR}/expected-s
 if [ ${#old_pkgs[@]} -ge 1 ]; then
 	msg "Removing old source packages..."
 	${SOURCE_CLEANUP_DRYRUN} && warning 'dry run mode is active'
-	for old_pkg in ${old_pkgs[@]}; do
+	for old_pkg in "${old_pkgs[@]}"; do
 		msg2 "${old_pkg}"
 		if ! ${SOURCE_CLEANUP_DRYRUN}; then
 			mv_acl "$FTP_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
@@ -137,7 +137,7 @@ fi
 old_pkgs=($(find ${SOURCE_CLEANUP_DESTDIR} -type f -name "*${SRCEXT}" -mtime +${SOURCE_CLEANUP_KEEP} -printf '%f\n'))
 if [ ${#old_pkgs[@]} -ge 1 ]; then
 	msg "Removing old source packages from the cleanup directory..."
-	for old_pkg in ${old_pkgs[@]}; do
+	for old_pkg in "${old_pkgs[@]}"; do
 		msg2 "${old_pkg}"
 		${SOURCE_CLEANUP_DRYRUN} || rm -f "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
 	done
diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index 1432bdf..2a26e6a 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -21,7 +21,7 @@ find "${FTP_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort
 
 pushd "${SVNREPO}" >/dev/null
 
-for repo in ${PKGREPOS[@]}; do
+for repo in "${PKGREPOS[@]}"; do
     msg "Sourceballing [${repo}]"
 
     pushd $repo >/dev/null
@@ -40,7 +40,7 @@ for repo in ${PKGREPOS[@]}; do
         unset build package url pkgdesc source md5sums depends makedepends \
               optdepends license arch options check mksource
 
-        for _pkg in ${pkgname[@]}; do
+        for _pkg in "${pkgname[@]}"; do
             unset package_${_pkg} >/dev/null 2>&1
         done
 
-- 
cgit v1.2.3-2-g168b


From cad2d8b7075cb255f76e79c12c23acee94074514 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 8 Jan 2014 21:02:13 -0500
Subject: repo-sanity-check: take advantage of printf

---
 cron-jobs/repo-sanity-check | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index 9d351df..8b0758f 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -41,8 +41,9 @@ for _repo in "${PKGREPOS[@]}"; do
     ))
 
 # Compares them, whatever is on repos but not on abs should be removed
-    remove=($(comm -13 <(echo ${on_abs[@]} | tr ' ' "\n" | sort -u) \
-             <(echo ${on_repo[@]} | tr ' ' "\n" | sort -u)))
+    remove=($(comm -13 \
+            <(printf '%s\n' "${on_abs[@]}"  | sort -u) \
+            <(printf '%s\n' "${on_repo[@]}" | sort -u) ))
 
 # Remove them from databases, ftpdir-cleanup will take care of the rest
     find ${FTP_BASE}/${_repo} -name "*.db.tar.?z" -exec \
-- 
cgit v1.2.3-2-g168b


From b6e8ebd66d22abf5439485985a7851e768c71e8a Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 8 Jan 2014 21:04:43 -0500
Subject: Be very careful about using $0.

---
 cron-jobs/ftpdir-cleanup      | 4 ++--
 cron-jobs/integrity-check     | 4 ++--
 cron-jobs/repo-sanity-check   | 4 ++--
 cron-jobs/sourceballs         | 2 +-
 cron-jobs/sourceballs2        | 2 +-
 cron-jobs/update-abs-tarballs | 2 +-
 cron-jobs/update-web-db       | 6 +++---
 7 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 83e6e17..8d691b5 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/../db-functions"
-. "$(dirname $0)/../config"
+. "$(dirname "$(readlink -e "$0")")/../db-functions"
+. "$(dirname "$(readlink -e "$0")")/../config"
 
 clean_pkg() {
 	local pkg
diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check
index d4f9694..05a56a5 100755
--- a/cron-jobs/integrity-check
+++ b/cron-jobs/integrity-check
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-dirname="$(dirname $0)"
+dirname="$(dirname "$(readlink -e "$0")")"
 
 . "${dirname}/../db-functions"
 . "${dirname}/../config"
@@ -8,7 +8,7 @@ dirname="$(dirname $0)"
 script_lock
 
 if [ $# -ne 1 ]; then
-	die "usage: $(basename $0) <mailto>"
+	die "usage: ${0##*/} <mailto>"
 fi
 mailto=$1
 
diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index 1ba90a6..2aa7892 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -1,8 +1,8 @@
 #!/bin/bash
 # Solves issue165
 
-. "$(dirname $0)/../db-functions"
-. "$(dirname $0)/../config"
+. "$(dirname "$(readlink -e "$0")")/../db-functions"
+. "$(dirname "$(readlink -e "$0")")/../config"
 
 # Traverse all repos
 for _repo in ${PKGREPOS[@]}; do
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index ee074bd..73d8432 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-dirname="$(dirname $(readlink -e $0))"
+dirname="$(dirname "$(readlink -e "$0")")"
 . "${dirname}/../db-functions"
 . "${dirname}/../config"
 pushd "${WORKDIR}" >/dev/null
diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index 5644268..eb46579 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -4,7 +4,7 @@
 # Makepkg --allsource every package
 # Remove the old sourceballs
 
-dirname="$(dirname $(readlink -e $0))"
+dirname="$(dirname "$(readlink -e "$0")")"
 . "${dirname}/../db-functions"
 . "${dirname}/../config"
 . "${MAKEPKGCONF}"
diff --git a/cron-jobs/update-abs-tarballs b/cron-jobs/update-abs-tarballs
index 824ac34..901cc4b 100755
--- a/cron-jobs/update-abs-tarballs
+++ b/cron-jobs/update-abs-tarballs
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(dirname $0)/../config"
+. "$(dirname "$(readlink -e "$0")")/../config"
 
 rsync -av --exclude=staging/ parabolagnulinux.org::abstar/ ${FTP_BASE}/
 
diff --git a/cron-jobs/update-web-db b/cron-jobs/update-web-db
index 6ced4c1..825eea6 100755
--- a/cron-jobs/update-web-db
+++ b/cron-jobs/update-web-db
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/../db-functions"
-. "$(dirname $0)/../config"
+. "$(dirname "$(readlink -e "$0")")/../db-functions"
+. "$(dirname "$(readlink -e "$0")")/../config"
 
 # setup paths
 SPATH="/srv/http/archweb"
@@ -14,7 +14,7 @@ REPOS=('community-testing' 'multilib-testing' 'multilib' 'community' 'extra' 'te
 LOGOUT="/tmp/archweb_update.log"
 
 # figure out what operation to perform
-cmd="$(basename $0)"
+cmd="${0##*/}"
 if [[ $cmd != "update-web-db" && $cmd != "update-web-files-db" ]]; then
 	die "Invalid command name '$cmd' specified!"
 fi
-- 
cgit v1.2.3-2-g168b


From 8650ad4fdef09b1244ba138531b6a1e2bbd0975b Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 8 Jan 2014 18:00:12 -0500
Subject: Get rid of $ARCH_BASE; these days it is the same as $FTP_BASE

---
 cron-jobs/sourceballs  | 10 +++++-----
 cron-jobs/sourceballs2 |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 73d8432..4debcee 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -21,10 +21,10 @@ renice +10 -p $$ > /dev/null
 for repo in ${PKGREPOS[@]}; do
 	for arch in ${ARCHES[@]}; do
 		# Repo does not exist; skip it
-		if [ ! -f "${ARCH_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" ]; then
+		if [ ! -f "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" ]; then
 			continue
 		fi
-		bsdtar -xOf "${ARCH_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" \
+		bsdtar -xOf "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" \
 			| awk '/^%NAME%/ { getline b };
 				/^%BASE%/ { getline b };
 				/^%VERSION%/ { getline v };
@@ -46,7 +46,7 @@ for repo in ${PKGREPOS[@]}; do
 done
 
 # Create a list of all available source package file names
-find "${ARCH_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs"
+find "${FTP_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs"
 
 # Check for all packages if we need to build a source package
 for repo in ${PKGREPOS[@]}; do
@@ -96,7 +96,7 @@ for repo in ${PKGREPOS[@]}; do
 			pushd "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null
 			makepkg --nocolor --allsource --ignorearch # >/dev/null 2>&1
 			if [ $? -eq 0 ] && [ -f "${pkgbase}-${pkgver}${SRCEXT}" ]; then
-				mv "${pkgbase}-${pkgver}${SRCEXT}" "${ARCH_BASE}/${SRCPOOL}"
+				mv "${pkgbase}-${pkgver}${SRCEXT}" "${FTP_BASE}/${SRCPOOL}"
 				# Avoid creating the same source package for every arch
 				echo "${pkgbase}-${pkgver}${SRCEXT}" >> "${WORKDIR}/available-src-pkgs"
 				newpkgs[${#newpkgs[*]}]="${pkgbase}-${pkgver}${SRCEXT}"
@@ -132,7 +132,7 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	for old_pkg in ${old_pkgs[@]}; do
 		msg2 "${old_pkg}"
 		if ! ${SOURCE_CLEANUP_DRYRUN}; then
-			mv "$ARCH_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}"
+			mv "$FTP_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}"
 			touch "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
 		fi
 	done
diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index eb46579..bbe227d 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -17,7 +17,7 @@ script_lock
 renice +10 -p $$ > /dev/null
 
 # Create a list of all available source package file names
-find "${ARCH_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs"
+find "${FTP_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs"
 
 pushd "${SVNREPO}" >/dev/null
 
-- 
cgit v1.2.3-2-g168b


From 62142bcbac5f457b2172c7311741f90fedf0c776 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 8 Jan 2014 15:20:16 -0500
Subject: fix comments, indentation

---
 cron-jobs/sourceballs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 4debcee..6393472 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -59,11 +59,11 @@ for repo in ${PKGREPOS[@]}; do
 		pkgarch=${pkginfo[2]}
 		pkglicense=(${pkginfo[@]:3})
 
-		# Should this packages be skipped?
+		# Should this package be skipped?
 		if grep -Fqx "${pkgbase}" "${dirname}/sourceballs.skip"; then
 			continue
 		fi
-        # Commenting out, we'll sourceball everything
+		# Commenting out, we'll sourceball everything
 		# Check if the license or .force file does not enforce creating a source package
 #		if ! (chk_license ${pkglicense[@]} || grep -Fqx "${pkgbase}" "${dirname}/sourceballs.force"); then
 #			continue
@@ -83,10 +83,10 @@ for repo in ${PKGREPOS[@]}; do
 			#svn export -q "${SVNREPO}/${pkgbase}/repos/${repo}-${pkgarch}" \
 			#	"${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null 2>&1
 
-            # If it's on official repos, nor [libre], nor [libre-testing]
-            cp -r "${SVNREPO}/$repo/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1 || \
-            cp -r "${SVNREPO}/libre/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1 || \
-            cp -r "${SVNREPO}/libre-testing/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1
+			# If it's on official repos, nor [libre], nor [libre-testing]
+			cp -r "${SVNREPO}/$repo/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1 || \
+				cp -r "${SVNREPO}/libre/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1 || \
+				cp -r "${SVNREPO}/libre-testing/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1
 			if [ $? -ge 1 ]; then
 				failedpkgs[${#failedpkgs[*]}]="${pkgbase}-${pkgver}${SRCEXT}"
 				continue
-- 
cgit v1.2.3-2-g168b


From eefb787983d2608511214bcd682f3d8271bac60c Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 8 Jan 2014 16:44:51 -0500
Subject: Normalize to load config then local_config then db-functions

---
 cron-jobs/ftpdir-cleanup    | 2 +-
 cron-jobs/integrity-check   | 2 +-
 cron-jobs/repo-sanity-check | 2 +-
 cron-jobs/sourceballs       | 2 +-
 cron-jobs/sourceballs2      | 2 +-
 cron-jobs/update-web-db     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 8d691b5..b290138 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname "$(readlink -e "$0")")/../db-functions"
 . "$(dirname "$(readlink -e "$0")")/../config"
+. "$(dirname "$(readlink -e "$0")")/../db-functions"
 
 clean_pkg() {
 	local pkg
diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check
index 05a56a5..86a8f1d 100755
--- a/cron-jobs/integrity-check
+++ b/cron-jobs/integrity-check
@@ -2,8 +2,8 @@
 
 dirname="$(dirname "$(readlink -e "$0")")"
 
-. "${dirname}/../db-functions"
 . "${dirname}/../config"
+. "${dirname}/../db-functions"
 
 script_lock
 
diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index 2aa7892..ee4c061 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -1,8 +1,8 @@
 #!/bin/bash
 # Solves issue165
 
-. "$(dirname "$(readlink -e "$0")")/../db-functions"
 . "$(dirname "$(readlink -e "$0")")/../config"
+. "$(dirname "$(readlink -e "$0")")/../db-functions"
 
 # Traverse all repos
 for _repo in ${PKGREPOS[@]}; do
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index 6393472..c9aadba 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 dirname="$(dirname "$(readlink -e "$0")")"
-. "${dirname}/../db-functions"
 . "${dirname}/../config"
+. "${dirname}/../db-functions"
 pushd "${WORKDIR}" >/dev/null
 
 script_lock
diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index bbe227d..1432bdf 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -5,8 +5,8 @@
 # Remove the old sourceballs
 
 dirname="$(dirname "$(readlink -e "$0")")"
-. "${dirname}/../db-functions"
 . "${dirname}/../config"
+. "${dirname}/../db-functions"
 . "${MAKEPKGCONF}"
 
 pushd "${WORKDIR}" >/dev/null
diff --git a/cron-jobs/update-web-db b/cron-jobs/update-web-db
index 825eea6..713e75e 100755
--- a/cron-jobs/update-web-db
+++ b/cron-jobs/update-web-db
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-. "$(dirname "$(readlink -e "$0")")/../db-functions"
 . "$(dirname "$(readlink -e "$0")")/../config"
+. "$(dirname "$(readlink -e "$0")")/../db-functions"
 
 # setup paths
 SPATH="/srv/http/archweb"
-- 
cgit v1.2.3-2-g168b


From 9d9116bd23720cf6c5b27aa39e5cc4c71de1fb26 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 8 Jan 2014 21:27:07 -0500
Subject: Fix some array quoting.

---
 cron-jobs/check_archlinux/parse_pkgbuilds.sh | 22 +++++++++++-----------
 cron-jobs/ftpdir-cleanup                     | 10 +++++-----
 cron-jobs/repo-sanity-check                  |  4 ++--
 cron-jobs/sourceballs                        | 28 ++++++++++++++--------------
 cron-jobs/sourceballs2                       |  4 ++--
 5 files changed, 34 insertions(+), 34 deletions(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/check_archlinux/parse_pkgbuilds.sh b/cron-jobs/check_archlinux/parse_pkgbuilds.sh
index 3f92169..c8d8618 100755
--- a/cron-jobs/check_archlinux/parse_pkgbuilds.sh
+++ b/cron-jobs/check_archlinux/parse_pkgbuilds.sh
@@ -6,18 +6,18 @@
 exit() { return; }
 
 splitpkg_overrides=('depends' 'optdepends' 'provides' 'conflicts')
-variables=('pkgname' 'pkgbase' 'epoch' 'pkgver' 'pkgrel' 'makedepends' 'arch' ${splitpkg_overrides[@]})
+variables=('pkgname' 'pkgbase' 'epoch' 'pkgver' 'pkgrel' 'makedepends' 'arch' "${splitpkg_overrides[@]}")
 readonly -a variables splitpkg_overrides
 
 backup_package_variables() {
-	for var in ${splitpkg_overrides[@]}; do
+	for var in "${splitpkg_overrides[@]}"; do
 		indirect="${var}_backup"
 		eval "${indirect}=(\${$var[@]})"
 	done
 }
 
 restore_package_variables() {
-	for var in ${splitpkg_overrides[@]}; do
+	for var in "${splitpkg_overrides[@]}"; do
 		indirect="${var}_backup"
 		if [ -n "${!indirect}" ]; then
 			eval "${var}=(\${$indirect[@]})"
@@ -42,31 +42,31 @@ print_info() {
 
 	if [ -n "$arch" ]; then
 		echo "%ARCH%"
-		for i in ${arch[@]}; do echo $i; done
+		for i in "${arch[@]}"; do echo $i; done
 		echo ""
 	fi
 	if [ -n "$depends" ]; then
 		echo "%DEPENDS%"
-		for i in ${depends[@]}; do
+		for i in "${depends[@]}"; do
 			echo $i
 		done
 		echo ""
 	fi
 	if [ -n "$makedepends" ]; then
 		echo "%MAKEDEPENDS%"
-		for i in ${makedepends[@]}; do
+		for i in "${makedepends[@]}"; do
 			echo $i
 		done
 		echo ""
 	fi
 	if [ -n "$conflicts" ]; then
 		echo "%CONFLICTS%"
-		for i in ${conflicts[@]}; do echo $i; done
+		for i in "${conflicts[@]}"; do echo $i; done
 		echo ""
 	fi
 	if [ -n "$provides" ]; then
 		echo "%PROVIDES%"
-		for i in ${provides[@]}; do echo $i; done
+		for i in "${provides[@]}"; do echo $i; done
 		echo ""
 	fi
 }
@@ -75,7 +75,7 @@ source_pkgbuild() {
 	ret=0
 	dir=$1
 	pkgbuild=$dir/PKGBUILD
-	for var in ${variables[@]}; do
+	for var in "${variables[@]}"; do
 		unset ${var}
 	done
 	source $pkgbuild &>/dev/null || ret=$?
@@ -88,7 +88,7 @@ source_pkgbuild() {
 
 	if [ "${#pkgname[@]}" -gt "1" ]; then
 		pkgbase=${pkgbase:-${pkgname[0]}}
-		for pkg in ${pkgname[@]}; do
+		for pkg in "${pkgname[@]}"; do
 			if [ "$(type -t package_${pkg})" != "function" ]; then
 				echo -e "%INVALID%\n$pkgbuild\n"
 				return 1
@@ -98,7 +98,7 @@ source_pkgbuild() {
 				while IFS= read -r line; do
 					var=${line%%=*}
 					var="${var#"${var%%[![:space:]]*}"}"   # remove leading whitespace characters
-					for realvar in ${variables[@]}; do
+					for realvar in "${variables[@]}"; do
 						if [ "$var" == "$realvar" ]; then
 							eval $line
 							break
diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index b290138..6455ed7 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -25,8 +25,8 @@ clean_pkg() {
 
 ${CLEANUP_DRYRUN} && warning 'dry run mode is active'
 
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		if [ ! -f "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" ]; then
 			continue
 		fi
@@ -69,7 +69,7 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 fi
 
 # cleanup of legacy $repo/os/any directories
-for repo in ${PKGREPOS[@]}; do
+for repo in "${PKGREPOS[@]}"; do
 	if [ ! -d "${FTP_BASE}/${repo}/os/any" ]; then
 		continue
 	fi
@@ -103,8 +103,8 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	done
 fi
 
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		repo_unlock ${repo} ${arch}
 	done
 done
diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index ee4c061..9d351df 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -5,7 +5,7 @@
 . "$(dirname "$(readlink -e "$0")")/../db-functions"
 
 # Traverse all repos
-for _repo in ${PKGREPOS[@]}; do
+for _repo in "${PKGREPOS[@]}"; do
     msg "Cleaning up [${_repo}]"
 
 # Find all pkgnames on this repo's abs
@@ -19,7 +19,7 @@ for _repo in ${PKGREPOS[@]}; do
                   >/dev/null 2>&1
 
 # also cleanup package functions
-            for _pkg in ${pkgname[@]}; do
+            for _pkg in "${pkgname[@]}"; do
                 unset package_${pkg} >/dev/null 2>&1
             done
             
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index c9aadba..8171980 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -7,8 +7,8 @@ pushd "${WORKDIR}" >/dev/null
 
 script_lock
 
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		repo_lock ${repo} ${arch} || exit 1
 	done
 done
@@ -18,8 +18,8 @@ renice +10 -p $$ > /dev/null
 
 # Create a readable file for each repo with the following format
 # <pkgbase|pkgname> <pkgver>-<pkgrel> <arch> <license>[ <license>]
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		# Repo does not exist; skip it
 		if [ ! -f "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" ]; then
 			continue
@@ -39,8 +39,8 @@ for repo in ${PKGREPOS[@]}; do
 	done | sort -u > "${WORKDIR}/db-${repo}"
 done
 
-for repo in ${PKGREPOS[@]}; do
-	for arch in ${ARCHES[@]}; do
+for repo in "${PKGREPOS[@]}"; do
+	for arch in "${ARCHES[@]}"; do
 		repo_unlock ${repo} ${arch}
 	done
 done
@@ -49,15 +49,15 @@ done
 find "${FTP_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs"
 
 # Check for all packages if we need to build a source package
-for repo in ${PKGREPOS[@]}; do
+for repo in "${PKGREPOS[@]}"; do
 	newpkgs=()
 	failedpkgs=()
 	while read line; do
-		pkginfo=(${line})
+		pkginfo=("${line}")
 		pkgbase=${pkginfo[0]}
 		pkgver=${pkginfo[1]}
 		pkgarch=${pkginfo[2]}
-		pkglicense=(${pkginfo[@]:3})
+		pkglicense=("${pkginfo[@]:3}")
 
 		# Should this package be skipped?
 		if grep -Fqx "${pkgbase}" "${dirname}/sourceballs.skip"; then
@@ -88,7 +88,7 @@ for repo in ${PKGREPOS[@]}; do
 				cp -r "${SVNREPO}/libre/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1 || \
 				cp -r "${SVNREPO}/libre-testing/${pkgbase}" "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/" >/dev/null 2>&1
 			if [ $? -ge 1 ]; then
-				failedpkgs[${#failedpkgs[*]}]="${pkgbase}-${pkgver}${SRCEXT}"
+				failedpkgs+=("${pkgbase}-${pkgver}${SRCEXT}")
 				continue
 			fi
 
@@ -109,13 +109,13 @@ for repo in ${PKGREPOS[@]}; do
 
 	if [ ${#newpkgs[@]} -ge 1 ]; then
 		msg "Adding source packages for [${repo}]..."
-		for new_pkg in ${newpkgs[@]}; do
+		for new_pkg in "${newpkgs[@]}"; do
 			msg2 "${new_pkg}"
 		done
 	fi
 	if [ ${#failedpkgs[@]} -ge 1 ]; then
 		msg "Failed to create source packages for [${repo}]..."
-		for failed_pkg in ${failedpkgs[@]}; do
+		for failed_pkg in "${failedpkgs[@]}"; do
 			msg2 "${failed_pkg}"
 		done
 	fi
@@ -129,7 +129,7 @@ old_pkgs=($(comm -23 "${WORKDIR}/available-src-pkgs.sort" "${WORKDIR}/expected-s
 if [ ${#old_pkgs[@]} -ge 1 ]; then
 	msg "Removing old source packages..."
 	${SOURCE_CLEANUP_DRYRUN} && warning 'dry run mode is active'
-	for old_pkg in ${old_pkgs[@]}; do
+	for old_pkg in "${old_pkgs[@]}"; do
 		msg2 "${old_pkg}"
 		if ! ${SOURCE_CLEANUP_DRYRUN}; then
 			mv "$FTP_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}"
@@ -141,7 +141,7 @@ fi
 old_pkgs=($(find ${SOURCE_CLEANUP_DESTDIR} -type f -name "*${SRCEXT}" -mtime +${SOURCE_CLEANUP_KEEP} -printf '%f\n'))
 if [ ${#old_pkgs[@]} -ge 1 ]; then
 	msg "Removing old source packages from the cleanup directory..."
-	for old_pkg in ${old_pkgs[@]}; do
+	for old_pkg in "${old_pkgs[@]}"; do
 		msg2 "${old_pkg}"
 		${SOURCE_CLEANUP_DRYRUN} || rm -f "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}"
 	done
diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index 1432bdf..2a26e6a 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -21,7 +21,7 @@ find "${FTP_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort
 
 pushd "${SVNREPO}" >/dev/null
 
-for repo in ${PKGREPOS[@]}; do
+for repo in "${PKGREPOS[@]}"; do
     msg "Sourceballing [${repo}]"
 
     pushd $repo >/dev/null
@@ -40,7 +40,7 @@ for repo in ${PKGREPOS[@]}; do
         unset build package url pkgdesc source md5sums depends makedepends \
               optdepends license arch options check mksource
 
-        for _pkg in ${pkgname[@]}; do
+        for _pkg in "${pkgname[@]}"; do
             unset package_${_pkg} >/dev/null 2>&1
         done
 
-- 
cgit v1.2.3-2-g168b


From d3afe9bb766bbdfaab1474d21fd5e28f0a356039 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 8 Jan 2014 20:49:48 -0500
Subject: Avoid using $(basename $var) , use ${var##*/} instead

---
 cron-jobs/ftpdir-cleanup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cron-jobs')

diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 6455ed7..cb14382 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -16,7 +16,7 @@ clean_pkg() {
 				if [ -e "$pkg.sig" ]; then
 					mv -f "$pkg.sig" "$CLEANUP_DESTDIR"
 				fi
-				touch "${CLEANUP_DESTDIR}/$(basename ${pkg})"
+				touch "${CLEANUP_DESTDIR}/${pkg##*/}"
 			fi
 		done
 	fi
-- 
cgit v1.2.3-2-g168b