summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2017-01-10 12:30:00 +0000
committerjperkin <jperkin@pkgsrc.org>2017-01-10 12:30:00 +0000
commita93ced88c2a332121e8fd5388414bd86164fb2b1 (patch)
tree1cc4bb562aaad4d9b7159084abe5f7549bfa6e1f
parentb907e8b59758d699752456b7e02428b32ed0ad0b (diff)
downloadpkgsrc-a93ced88c2a332121e8fd5388414bd86164fb2b1.tar.gz
Test for existing $prefix and $pkgdbdir and bail out early if they exist,
rather than failing with exotic errors later.
-rwxr-xr-xbootstrap/bootstrap10
1 files changed, 9 insertions, 1 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index 38a0b3f09e1..f89f0dc8431 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: bootstrap,v 1.236 2017/01/10 12:16:08 jperkin Exp $
+# $NetBSD: bootstrap,v 1.237 2017/01/10 12:30:00 jperkin Exp $
#
# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
# All rights reserved.
@@ -933,6 +933,14 @@ if [ -d "${wrkdir}" ] || [ -f "${wrkdir}" ]; then
die "\"${wrkdir}\" already exists, please remove it or use --workdir"
fi
+if [ -f "${prefix}/share/mk/sys.mk" ]; then
+ die "\"${prefix}\" already in use, remove it or use a different --prefix"
+fi
+
+if [ -d "${pkgdbdir}/bootstrap-mk-files-"* ]; then
+ die "\"${pkgdbdir}\" already in use, remove it or use a different --pkgdbdir"
+fi
+
mkdir_p_early ${wrkdir}
if touch ${wrkdir}/.writeable; then
: