From 4d0642f1f2d0c721f0e6fada048ff264c384bfdb Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Wed, 10 Oct 2007 09:04:21 +0000
Subject: When installing the bootstrap kit from a directory, correctly handle
 the case when ${prefix} already exists.

---
 pkgtools/pbulk/files/pbulk/scripts/client-clean | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'pkgtools')

diff --git a/pkgtools/pbulk/files/pbulk/scripts/client-clean b/pkgtools/pbulk/files/pbulk/scripts/client-clean
index f218daf1e7d..b448ba8e2a6 100755
--- a/pkgtools/pbulk/files/pbulk/scripts/client-clean
+++ b/pkgtools/pbulk/files/pbulk/scripts/client-clean
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: client-clean,v 1.5 2007/09/22 00:12:33 rillig Exp $
+# $NetBSD: client-clean,v 1.6 2007/10/10 09:04:21 rillig Exp $
 
 . @PBULK_CONFIG@
 
@@ -14,7 +14,8 @@ rm -rf ${prefix} ${pkgdb} ${varbase}/qmail 2> /dev/null || true
 if [ -f "${bootstrapkit}" ]; then
 	${tar} -xzf ${bootstrapkit} -C /
 elif [ -d "${bootstrapkit}" ]; then
-	cp -R ${bootstrapkit} ${prefix}
+	[ -d ${prefix} ] || mkdir ${prefix}
+	cp -R ${bootstrapkit}/* ${prefix}
 else
 	# Do nothing
 fi
-- 
cgit v1.2.3