From efe6325910bb0ca83e59f32b6cb937882434bf74 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Thu, 2 May 2013 22:46:07 -0400
Subject: fix libremakepkg

---
 src/chroot-tools/libremakepkg           | 11 ++++++-----
 src/devtools/lib/makechrootpkg.sh.patch |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg
index 25f23c6..8e34f4a 100755
--- a/src/chroot-tools/libremakepkg
+++ b/src/chroot-tools/libremakepkg
@@ -50,6 +50,7 @@ trap_exit() {
 run() {
 	local HASNET=true
 	[[ $1 == -N ]] && { HASNET=false; shift; }
+	local copydir=$1; shift
 	local cmd="$*"
 
 	cat >"$copydir/chrootexec" <<EOF
@@ -104,16 +105,16 @@ chroot_copy_out() (
 # Usage: chroot_let_nobody_use_pacman $copydir
 chroot_let_nobody_use_pacman() (
 	set +euE
-	. /usr/share/devtools/makechrootpkg.real.sh
+	. /usr/share/devtools/makechrootpkg.sh
 	chroot_let_nobody_use_pacman "$@"
-}
+)
 
 # Usage: chroot_init $copydir $repack
 # Environment
 # - $LIBREHOME is set
 chroot_init() {
-	local $copydir=$1
-	local $repack=$2
+	local copydir=$1
+	local repack=$2
 
 	librechroot -l "$copydir" make # make sure the chroot exists
 	mkdir -p "$copydir"/{build,pkgdest,srcdest}
@@ -137,7 +138,7 @@ Server = file:///repo
 EOF
 	fi
 
-	chroot_let_nobody_use_pacman
+	chroot_let_nobody_use_pacman "$copydir"
 }
 
 # Core functions ###############################################################
diff --git a/src/devtools/lib/makechrootpkg.sh.patch b/src/devtools/lib/makechrootpkg.sh.patch
index 618d7e9..6016ba4 100644
--- a/src/devtools/lib/makechrootpkg.sh.patch
+++ b/src/devtools/lib/makechrootpkg.sh.patch
@@ -166,7 +166,7 @@
  		chown "$src_owner" "$pkgfile"
  		mv "$pkgfile" "$PKGDEST"
 +		if [[ $PKGDEST != . ]]; then
-+			ln -s "$PKGDEST/${pkgfile##*/}" .
++			ln -sf "$PKGDEST/${pkgfile##*/}" .
 +		fi
  	done
 +}
-- 
cgit v1.2.3-54-g00ecf