[pkgsrc/trunk]: pkgsrc/bootstrap Renamed the ignoreusercheck variable to unpr...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5bd3711e2183
branches:  trunk
changeset: 534834:5bd3711e2183
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Nov 01 23:18:54 2007 +0000

description:
Renamed the ignoreusercheck variable to unprivileged, since it does more
than just checking whether the bootstrap is run by root. No other
visible changes.

diffstat:

 bootstrap/bootstrap |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (56 lines):

diff -r f5c120d7bb71 -r 5bd3711e2183 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Thu Nov 01 23:08:29 2007 +0000
+++ b/bootstrap/bootstrap       Thu Nov 01 23:18:54 2007 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.115 2007/10/17 02:45:42 rillig Exp $
+# $NetBSD: bootstrap,v 1.116 2007/11/01 23:18:54 rillig Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -48,7 +48,7 @@
 export MAKECONF
 
 ignorecasecheck=no
-ignoreusercheck=no
+unprivileged=no
 
 preserve_path=no
 
@@ -331,7 +331,7 @@
        --compiler=*)   compiler=`get_optarg "$1"` ;;
        --compiler)     compiler="$2"; shift ;;
        --ignore-case-check) ignorecasecheck=yes ;;
-       --unprivileged | --ignore-user-check) ignoreusercheck=yes ;;
+       --unprivileged | --ignore-user-check) unprivileged=yes ;;
        --preserve-path) preserve_path=yes ;;
        --mk-fragment=*)
                        mk_fragment=`get_optarg "$1"` ;;
@@ -355,7 +355,7 @@
 
 # set defaults for system locations if not already set by the user
 wrkobjdir=${wrkdir}/pkgsrc
-if [ "$ignoreusercheck" = "yes" ]; then
+if [ "$unprivileged" = "yes" ]; then
        [ -z "$prefix" ] && prefix=${HOME}/pkg
        [ -z "$pkgdbdir" ] && pkgdbdir=${prefix}/var/db/pkg
        [ -z "$varbase" ] && varbase=${prefix}/var
@@ -689,7 +689,7 @@
        user=$root_user
        group=$root_group
 else
-       if [ $ignoreusercheck = "no" ]; then
+       if [ $unprivileged = "no" ]; then
                die "You must be either root to install bootstrap-pkgsrc or use the --unprivileged option."
        fi
 
@@ -765,7 +765,7 @@
 fi
 
 # enable unprivileged builds if not root
-if [ "$ignoreusercheck" = "yes" ]; then
+if [ "$unprivileged" = "yes" ]; then
        echo "UNPRIVILEGED=             yes" >> ${TARGET_MKCONF}
 fi