From fd1e5a426713715d9c0e3fabbfe0d8a20b629bad Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 28 Nov 2012 15:18:44 -0500
Subject: chroot-tools: disable overriding CHROOTDIR at the command line

---
 src/chroot-tools/librechroot   | 2 --
 src/chroot-tools/libremakepkg  | 2 --
 src/chroot-tools/libremkchroot | 2 --
 3 files changed, 6 deletions(-)

(limited to 'src')

diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot
index a5c5728..48e6cdc 100755
--- a/src/chroot-tools/librechroot
+++ b/src/chroot-tools/librechroot
@@ -136,7 +136,6 @@ usage() {
 	echo ''
 	echo 'Options:'
 	echo ' Settings:'
-	echo " -d <CHROOTDIR>  Use this dir instead of \`${CHROOTDIR}'"
 	echo ' -l <copy>       Use this as the chroot copy instead of basing it'
 	echo '                 on the username'
 	echo ' Modes:'
@@ -156,7 +155,6 @@ main() {
 	local mode=enter
 	while getopts 'hrcud:l:' arg; do
 		case $arg in
-			d) CHROOTDIR=$OPTARG;;
 			l) CHROOTCOPY=$OPTARG;;
 
 			c) mode=clean_pacman;;
diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg
index 4593121..faa50be 100755
--- a/src/chroot-tools/libremakepkg
+++ b/src/chroot-tools/libremakepkg
@@ -53,7 +53,6 @@ usage() {
     echo ' -u              Update the chroot before building'
     echo ' -N              Do not check freedom issues (for fullpkg)'
     echo ''
-    echo " -d <chrootdir>  Use this dir instead of \`$CHROOTDIR'"
     echo " -n <chroot>     Use this chroot instead of \`$CHROOT'"
     echo ' -l <copy>       Use this chroot copy instead of basing it'
     echo '                 on the username'
@@ -77,7 +76,6 @@ main() {
 			u) UPDATEFIRST=true;;
 			N) CHECKNONFREE=false;;
 
-			d) CHROOTDIR=$OPTARG;;
 			n) CHROOT=$OPTARG;;
 			l) CHROOTCOPY=$OPTARG;;
 
diff --git a/src/chroot-tools/libremkchroot b/src/chroot-tools/libremkchroot
index cc5b431..08f69b1 100755
--- a/src/chroot-tools/libremkchroot
+++ b/src/chroot-tools/libremkchroot
@@ -35,7 +35,6 @@ usage() {
 	echo 'Options:'
 	echo ' -h              Show this message'
 	echo ''
-	echo ' -d <chrootdir>  Use this dir instead of "$CHROOTDIR".'
 	echo ' -C <file>       Location of pacman config file.'
 	echo ' -M <file>       Location of makepkg config file.'
 }
@@ -45,7 +44,6 @@ main() {
 	while getopts 'hfd:C:M:' arg; do
 		case "$arg" in
 			C|M) mkarchroot_args+=("-$arg" "$OPTARG");;
-			d) CHROOTDIR=$OPTARG;;
 
 			h) usage; exit 0;;
 			*) usage; exit 1;;
-- 
cgit v1.2.2