Aaron broke it

The new dbscripts do not need this. All info can
be gathered from the $CARCH variable in the filename.

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>

archrelease

@@ -5,16 +5,40 @@ if [ "$1" = "" ]; then
     exit 1
 fi
 
+if [ ! -f "PKGBUILD" ]; then
+    echo "archrelease: PKGBUILD not found"
+    exit 1
+fi
+
+if [ "$(basename $(readlink -f .))" != "trunk" ]; then
+    echo "archrelease: Not in a package trunk dir"
+    exit 1
+fi
+
 if [ ! -d ../repos/$1 ]; then
     pushd ..
+    [ -d repos ] || mkdir repos
     svn copy -r HEAD trunk repos/$1
     svn commit -m "archrelease: new repo $1"
+    pushd repos/$1
+    svnmerge init
+    svn commit -F svnmerge-commit-message.txt
+    rm svnmerge-commit-message.txt
+    popd
     popd
 else
     svnmerge merge ../repos/$1
     pushd ..
     if [ -f trunk/svnmerge-commit-message.txt ]; then
         svn commit -F trunk/svnmerge-commit-message.txt
+        if [ $? -ne 0 ]; then
+            # The user is going to have to clean things up a bit
+            echo "*** ATTENTION: There was a problem merging the package changes ***"
+            echo "To fix it, edit the conflicting files in repos/$1 (the ones that are C in svn status)."
+            echo "Once you have resolved conflicts, execute 'svn resolved <path to file>' to tell svn the error was resolved."
+            echo "Then to finish the merge commit, execute 'svn commit -F trunk/svnmerge-commit-message.txt' and, if there are no problems, delete trunk/svnmerge-commit-message.txt"
+            exit $?
+        fi
         rm trunk/svnmerge-commit-message.txt
     else
         echo "Nothing to commit"

extrapkg

@@ -20,12 +20,7 @@ if [ ! -f PKGBUILD ]; then
     exit 1
 fi
 
-# define staging areas based on architecture
+if [ -z "$CARCH" ]; then
-if [ "$CARCH" = "i686" ]; then
-    suffix=''
-elif [ "$CARCH" = "x86_64" ]; then
-    suffix='64'
-else
     echo "CARCH must be set to a recognized value!"
     exit 1
 fi
@@ -68,8 +63,8 @@ if [ "$1" = "-l" ]; then
 fi
 
 if [ "$repo" != "community" ]; then
-    # combine what we know into a variable (suffix defined based on $CARCH)
+    # combine what we know into a variable
-    uploadto="staging/${repo}${suffix}/add/$(basename ${pkgfile})"
+    uploadto="staging/${repo}/add/$(basename ${pkgfile})"
     scp ${scpopts} "${pkgfile}" "archlinux.org:${uploadto}"
     if [ "$(md5sum "${pkgfile}" | cut -d' ' -f1)" != "$(ssh archlinux.org md5sum "${uploadto}" | cut -d' ' -f1)" ]; then
         echo "File got corrupted during upload, cancelled."
@@ -83,7 +78,7 @@ else
         exit 1
     fi
     if [ "$(basename $pkgfile)" != "$(basename $oldstylepkgfile)" ]; then
-        echo "Renaming makepkg3 package for compatability"
+        echo "Renaming makepkg3 package for compatibility"
         mv $pkgfile $oldstylepkgfile
         pkgfile=$oldstylepkgfile
     fi

makechrootpkg

@@ -14,6 +14,7 @@ MAKEPKG_ARGS="-sr"
 REPACK=""
 WORKDIR=$PWD
 clean_first="0"
+install_pkg=""
 
 chrootdir="$CHROOT_SHELL"
 
@@ -45,9 +46,10 @@ usage ()
     exit 1
 }
 
-while getopts ':r:h:c' arg; do
+while getopts ':r:i:h:c' arg; do
     case "${arg}" in
         r) chrootdir="$OPTARG" ;;
+        i) install_pkg="$OPTARG" ;;
         c) clean_first=1 ;;
         h|?) usage ;;
         *) MAKEPKG_ARGS="$MAKEPKG_ARGS -$arg $OPTARG" ;;
@@ -114,6 +116,17 @@ fi
 mount -t unionfs none -o "dirs=$chrootdir/rw=rw:$chrootdir/root=ro" "$uniondir"
 trap 'cleanup' 0 1 2 15
 
+if [ -n "$install_pkg" ]; then
+    pkgname="$(basename "$install_pkg")"
+    echo "installing '$pkgname' in chroot"
+    cp "$install_pkg" "$uniondir/$pkgname"
+    mkarchroot -r "pacman -U /$pkgname" "$uniondir"
+    ret=$?
+    rm "$uniondir/$pkgname"
+    #exit early, we've done all we need to
+    exit $ret
+fi
+
 echo "moving build files to chroot"
 [ -d "$uniondir/build" ] || mkdir "$uniondir/build"
 
@@ -168,8 +181,13 @@ if [ "$install" != "" -a -f "$install" ]; then
     cp "$install" "$uniondir/build/"
 fi
 
+if [ -f "ChangeLog" ]; then
+    cp ChangeLog "$uniondir/build/"
+fi
+
 if ! grep "^nobody" "$uniondir/etc/sudoers" >/dev/null 2>&1; then
     echo "allowing 'nobody' sudo rights in the chroot"
+    touch "$uniondir/etc/sudoers"
     echo "nobody	ALL=(ALL) NOPASSWD: ALL" >> "$uniondir/etc/sudoers"
     chmod 440 "$uniondir/etc/sudoers"
 fi
@@ -188,22 +206,23 @@ chmod +x "$uniondir/chrootbuild"
 
 mkarchroot -r "/chrootbuild" "$uniondir"
 
+source ${WORKDIR}/PKGBUILD
+if [ -z "$(mount | grep ${chrootdir}/union/pkgdest)" ]; then
+    echo "Moving completed package file to ${WORKDIR}"
+    mv ${chrootdir}/union/pkgdest/${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz ${WORKDIR}
+fi
+if [ -z "$(mount | grep ${chrootdir}/union/srcdest)" ]; then
+    echo "Moving downloaded source files to ${WORKDIR}"
+    mv ${chrootdir}/union/srcdest/* ${WORKDIR}
+fi
+
 if [ -e ${chrootdir}/rw/build/BUILD_FAILED ]; then
     echo "Build failed, check \$CHROOT_DIR/rw/build"
     rm ${chrootdir}/rw/build/BUILD_FAILED
-    exit 1
+else
-else	
-    source ${WORKDIR}/PKGBUILD
-    if [ -z "$(mount | grep ${chrootdir}/union/pkgdest)" ]; then
-        echo "Moving completed package file to ${WORKDIR}"
-        mv ${chrootdir}/union/pkgdest/${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz ${WORKDIR}
-    fi
-    if [ -z "$(mount | grep ${chrootdir}/union/srcdest)" ]; then
-        echo "Moving downloaded source files to ${WORKDIR}"
-        mv ${chrootdir}/union/srcdest/* ${WORKDIR}
-    fi
     rm -rf ${chrootdir}/rw/build/*
     echo "Build complete"
-fi
+fi	
+
 
 # vim:ft=sh:ts=4:sw=4:et: