CVS commit: pkgsrc/bootstrap

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jan 10 12:30:00 UTC 2017

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
Test for existing $prefix and $pkgdbdir and bail out early if they exist,
rather than failing with exotic errors later.


To generate a diff of this commit:
cvs rdiff -u -r1.236 -r1.237 pkgsrc/bootstrap/bootstrap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.236 pkgsrc/bootstrap/bootstrap:1.237
--- pkgsrc/bootstrap/bootstrap:1.236    Tue Jan 10 12:16:08 2017
+++ pkgsrc/bootstrap/bootstrap  Tue Jan 10 12:30:00 2017
@@ -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@localhost>
 # All rights reserved.
@@ -933,6 +933,14 @@ if [ -d "${wrkdir}" ] || [ -f "${wrkdir}
        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
        :