From d0b5dcb3ce6a1ec5222fc7a0420b3e1dc4c3a27e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Aug 2010 11:53:07 +0200
Subject: Remove BUILDSCRIPT variable

There is no need to have a variable for things like PKGBUILD
that are very unlikely to ever change.
---
 config                           | 1 -
 db-move                          | 2 +-
 db-remove                        | 2 +-
 db-update                        | 8 ++++----
 misc-scripts/make-sourceball     | 2 +-
 misc-scripts/sourceballs-cleanup | 4 ++--
 testing2x                        | 4 ++--
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/config b/config
index 88e50bc..f6600a6 100644
--- a/config
+++ b/config
@@ -14,7 +14,6 @@ LOCK_TIMEOUT=300
 STAGING="$HOME/staging"
 TMPDIR="/srv/tmp"
 ARCHES=(i686 x86_64)
-BUILDSCRIPT="PKGBUILD"
 DBEXT=".db.tar.gz"
 PKGEXT=".pkg.tar.*"
 SRCEXT=".src.tar.gz"
diff --git a/db-move b/db-move
index 7dff563..8347a18 100755
--- a/db-move
+++ b/db-move
@@ -60,7 +60,7 @@ cd checkout
 
 /usr/bin/svn up -q $packagebase
 if [ -d "$packagebase/repos/$svnrepo_from" ]; then
-	. "$packagebase/repos/$svnrepo_from/$BUILDSCRIPT"
+	. "$packagebase/repos/$svnrepo_from/PKGBUILD"
 
 	echo -n "Moving $packagebase from $repofrom to $repoto..."
 	if [ -d "$packagebase/repos/$svnrepo_to" ]; then
diff --git a/db-remove b/db-remove
index bf325c4..1314bb7 100755
--- a/db-remove
+++ b/db-remove
@@ -50,7 +50,7 @@ cd checkout
 
 /usr/bin/svn up -q $packagebase
 if [ -d "$packagebase/repos/$svnrepo" ]; then
-	. "$packagebase/repos/$svnrepo/$BUILDSCRIPT"
+	. "$packagebase/repos/$svnrepo/PKGBUILD"
 	/usr/bin/svn rm --force -q "$packagebase/repos/$svnrepo"
 	/usr/bin/svn commit -q -m "$(basename $0): $packagebase removed by $(id -un)"
 else
diff --git a/db-update b/db-update
index 9dd5c9d..a08bee2 100755
--- a/db-update
+++ b/db-update
@@ -93,11 +93,11 @@ if [ -n "$ANYPKGS" ]; then
 		else
 			/usr/bin/svn up -q $_pkgbase
 			if [ -d "$_pkgbase/repos/$svnrepo" ]; then
-				. "$_pkgbase/repos/$svnrepo/$BUILDSCRIPT"
+				. "$_pkgbase/repos/$svnrepo/PKGBUILD"
 				if echo "$_pkgfile" | grep -q "$_pkgname-$pkgver-$pkgrel-any"; then
 					to_add_any="$to_add_any $pkg"
 				else
-					echo "    WARNING: $_pkgfile does not match $BUILDSCRIPT in $svnrepo"
+					echo "    WARNING: $_pkgfile does not match PKGBUILD in $svnrepo"
 				fi
 			else
 				echo "    WARNING: Package $_pkgbase not found in $svnrepo"
@@ -163,11 +163,11 @@ for current_arch in ${ARCHES[@]}; do
 				else
 					/usr/bin/svn up -q $_pkgbase
 					if [ -d "$_pkgbase/repos/$svnrepo" ]; then
-						. "$_pkgbase/repos/$svnrepo/$BUILDSCRIPT"
+						. "$_pkgbase/repos/$svnrepo/PKGBUILD"
 						if echo "$_pkgfile" | grep -q "$_pkgname-$pkgver-$pkgrel-$current_arch"; then
 							to_add="$to_add $pkg"
 						else
-							echo "    WARNING: $_pkgfile does not match $BUILDSCRIPT in $svnrepo"
+							echo "    WARNING: $_pkgfile does not match PKGBUILD in $svnrepo"
 						fi
 					else
 						echo "    WARNING: Package $_pkgbase not found in $svnrepo"
diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball
index 37141c7..41767d0 100755
--- a/misc-scripts/make-sourceball
+++ b/misc-scripts/make-sourceball
@@ -43,7 +43,7 @@ die() {
 create_srcpackage() {
     if [ -d "$1" ]; then
         pushd "$1" >/dev/null
-        . "$BUILDSCRIPT"
+        . "PKGBUILD"
 	if ! [ $FORCE == 1 ] && ! chk_license ${license[@]} ; then
             #Removed so as not to clutter failed.txt
             #echo -e "\t$packagename license (${license[@]}) does not require source tarballs" >&2
diff --git a/misc-scripts/sourceballs-cleanup b/misc-scripts/sourceballs-cleanup
index c7f284d..d259d3a 100755
--- a/misc-scripts/sourceballs-cleanup
+++ b/misc-scripts/sourceballs-cleanup
@@ -27,7 +27,7 @@ remove_old() {
         PKGVERS=""
         for repo in *; do
             cd "$repo"
-            . "$BUILDSCRIPT"
+            . "PKGBUILD"
             PKGVERS="$PKGVERS $pkgver-$pkgrel"
             cd ..
         done
@@ -85,7 +85,7 @@ for sourceball in "$srcpath"/*$SRCEXT; do
     elif [ -z "$(ls -A "$packagename/repos")" ]; then
       echo "$packagename : no longer in repos but trunk is still in svn.  Removing sourceball." >> "$logfile"
       mv $sourceball $SOURCE_CLEANUP_DESTDIR
-    elif !  source  "$packagename/trunk/$BUILDSCRIPT" &&  chk_license ${license[@]}; then
+    elif !  source  "$packagename/trunk/PKGBUILD" &&  chk_license ${license[@]}; then
       echo "$packagename : source hosting no longer required by license.  Removing sourceball." >> "$logfile"
       mv $sourceball $SOURCE_CLEANUP_DESTDIR
     else
diff --git a/testing2x b/testing2x
index f9ded9e..4826853 100755
--- a/testing2x
+++ b/testing2x
@@ -35,9 +35,9 @@ cd checkout
 for pkg in $*; do
     moved=0
     /usr/bin/svn up -q ${pkg}
-    if [ -f "${pkg}/repos/testing-${_arch}/${BUILDSCRIPT}" ]; then
+    if [ -f "${pkg}/repos/testing-${_arch}/PKGBUILD" ]; then
         for repo in core extra; do
-            if [ -f "${pkg}/repos/${repo}-${_arch}/${BUILDSCRIPT}" ]; then
+            if [ -f "${pkg}/repos/${repo}-${_arch}/PKGBUILD" ]; then
                 echo "===> Moving package '${pkg}': testing-${_arch} -> ${repo}-${_arch}"
                 $(dirname $0)/db-move "${pkg}" "testing" "${repo}" "${_arch}"
                 moved=1
-- 
cgit v1.1-4-g5e80