From c6f4aa322b59f69b304a34a4f7142445489f09d0 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 24 Nov 2009 12:21:49 +0000
Subject: [PATCH] Use the new xbps-uhelper bin, require xbps utils 20091124-1.

--HG--
extra : convert_revision : d29be962c344de65b805f4690afc335db32b541e
---
 xbps-src/shutils/chroot.sh | 22 ++++++++--------------
 xbps-src/xbps-src.sh.in    | 10 +++++-----
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/xbps-src/shutils/chroot.sh b/xbps-src/shutils/chroot.sh
index 4fabfebcb7..eadd1644ea 100644
--- a/xbps-src/shutils/chroot.sh
+++ b/xbps-src/shutils/chroot.sh
@@ -123,10 +123,10 @@ create_busybox_links()
 
 install_xbps_utils()
 {
-	local needed fetch_cmd
+	local needed _cmd
 	local xbps_prefix=$XBPS_MASTERDIR/usr/local
 
-	for f in bin cmpver digest pkgdb; do
+	for f in bin repo uhelper; do
 		if [ ! -x $xbps_prefix/sbin/xbps-${f}.static ]; then
 			needed=yes
 		fi
@@ -136,17 +136,11 @@ install_xbps_utils()
 		echo "=> Installing the required XBPS utils."
 		chroot $XBPS_MASTERDIR sh -c \
 			"echo /usr/local/lib > /etc/ld.so.conf"
-		fetch_cmd="$(which $XBPS_FETCH_CMD 2>/dev/null)"
-		if [ -z "$fetch_cmd" ]; then
-			echo "Unexistent XBPS_FETCH_CMD specified!"
-			exit 1
-		fi
-		cp -f $fetch_cmd $xbps_prefix/sbin
-		for f in bin cmpver digest pkgdb repo; do
-			_cmd="$(which xbps-${f}.static 2>/dev/null)"
-			if [ -z "$_cmd" ]; then
-				echo "Unexisting xbps-${f}.static bin!"
-				exit 1	
+		for f in bin repo uhelper; do
+			_cmd=$(which xbps-${f}.static 2>/dev/null)
+			if [ -z "${_cmd}" ]; then
+				echo "Unexistent xbps-uhelper.static file!"
+				exit 1
 			fi
 			cp -f ${_cmd} $xbps_prefix/sbin
 		done
@@ -299,7 +293,7 @@ echo "XBPS_BUILDDIR=/xbps_builddir" >> $XBPSSRC_CF
 echo "XBPS_SRCDISTDIR=/xbps_srcdistdir" >> $XBPSSRC_CF
 echo "XBPS_CFLAGS=\"$XBPS_CFLAGS\"" >> $XBPSSRC_CF
 echo "XBPS_CXXFLAGS=\"\$XBPS_CFLAGS\"" >> $XBPSSRC_CF
-echo "XBPS_FETCH_CMD=$XBPS_FETCH_CMD" >> $XBPSSRC_CF
+echo "XBPS_FETCH_CMD='xbps-uhelper.static fetch'" >> $XBPSSRC_CF
 if [ -n "$XBPS_MAKEJOBS" ]; then
 	echo "XBPS_MAKEJOBS=$XBPS_MAKEJOBS" >> $XBPSSRC_CF
 fi
diff --git a/xbps-src/xbps-src.sh.in b/xbps-src/xbps-src.sh.in
index 985f97e660..0783849c4f 100644
--- a/xbps-src/xbps-src.sh.in
+++ b/xbps-src/xbps-src.sh.in
@@ -30,7 +30,7 @@ trap "echo && exit 1" INT QUIT
 : ${progname:=$(basename $0)}
 : ${fakeroot_cmd:=fakeroot}
 : ${xbps_machine:=$(uname -m)}
-: ${XBPS_UTILS_REQVER:=20091123}
+: ${XBPS_UTILS_REQVER:=20091124-1}
 
 usage()
 {
@@ -116,11 +116,11 @@ set_defvars()
 		[ ! -d "$val" ] &&  msg_error "cannot find $i, aborting."
 	done
 
-	export XBPS_PKGDB_CMD="xbps-pkgdb.static -r $XBPS_MASTERDIR"
+	export XBPS_PKGDB_CMD="xbps-uhelper.static -r $XBPS_MASTERDIR"
 	export XBPS_BIN_CMD="xbps-bin.static -r $XBPS_MASTERDIR"
-	export XBPS_DIGEST_CMD="xbps-digest.static"
-	export XBPS_CMPVER_CMD="xbps-cmpver.static"
-	export XBPS_FETCH_CMD="xbps-fetch.static"
+	export XBPS_DIGEST_CMD="xbps-uhelper.static digest"
+	export XBPS_CMPVER_CMD="xbps-uhelper.static cmpver"
+	export XBPS_FETCH_CMD="xbps-uhelper.static fetch"
 
 	#
 	# Check that installed xbps utils version is recent enough.