Allow the use of ${DESTDIR} in the enviroment to optionally get

these various collections to install someplace else.

17 files changed, 36 insertions, 27 deletions

diff --git a/release/scripts/base-install.sh b/release/scripts/base-install.sh
index 8fab5c2..6b32b03 100755
--- a/release/scripts/base-install.sh
+++ b/release/scripts/base-install.sh
@@ -4,9 +4,10 @@ if [ "`id -u`" != "0" ]; then
 	echo "Sorry, this must be done as root."
 	exit 1
 fi
-echo "You are about to extract the base distribution into / - are you SURE"
+
+echo "You are about to extract the base distribution into ${DESTDIR:-/} - are you SURE"
 echo -n "you want to do this over your installed system (y/n)? "
 read ans 
 if [ "$ans" = "y" ]; then
-	cat bin.?? | tar --unlink -xpzf - -C /
+	cat bin.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
 fi
diff --git a/release/scripts/bin-install.sh b/release/scripts/bin-install.sh
index 8fab5c2..6b32b03 100755
--- a/release/scripts/bin-install.sh
+++ b/release/scripts/bin-install.sh
@@ -4,9 +4,10 @@ if [ "`id -u`" != "0" ]; then
 	echo "Sorry, this must be done as root."
 	exit 1
 fi
-echo "You are about to extract the base distribution into / - are you SURE"
+
+echo "You are about to extract the base distribution into ${DESTDIR:-/} - are you SURE"
 echo -n "you want to do this over your installed system (y/n)? "
 read ans 
 if [ "$ans" = "y" ]; then
-	cat bin.?? | tar --unlink -xpzf - -C /
+	cat bin.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
 fi
diff --git a/release/scripts/catpages-install.sh b/release/scripts/catpages-install.sh
index ce408fe..e2806d4 100755
--- a/release/scripts/catpages-install.sh
+++ b/release/scripts/catpages-install.sh
@@ -4,5 +4,5 @@ if [ "`id -u`" != "0" ]; then
 	echo "Sorry, this must be done as root."
 	exit 1
 fi
-cat catpages.?? | tar --unlink -xpzf - -C /
+cat catpages.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
 exit 0
diff --git a/release/scripts/commerce-install.sh b/release/scripts/commerce-install.sh
index e8a8ca7..37912e3 100755
--- a/release/scripts/commerce-install.sh
+++ b/release/scripts/commerce-install.sh
@@ -4,5 +4,6 @@ if [ "`id -u`" != "0" ]; then
 	echo "Sorry, this must be done as root."
 	exit 1
 fi
-tar --unlink -xpzf commerce.tgz -C /usr/local
+echo "Extracting commerce tarball into ${DESTDIR}/usr/local"
+tar --unlink -xpzf commerce.tgz -C ${DESTDIR}/usr/local
 exit 0
diff --git a/release/scripts/compat1x-install.sh b/release/scripts/compat1x-install.sh
index e0df742..18dbcab 100755
--- a/release/scripts/compat1x-install.sh
+++ b/release/scripts/compat1x-install.sh
@@ -4,5 +4,5 @@ if [ "`id -u`" != "0" ]; then
 	echo "Sorry, this must be done as root."
 	exit 1
 fi
-cat compat1x.?? | tar --unlink -xpzf - -C /
+cat compat1x.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
 exit 0
diff --git a/release/scripts/compat20-install.sh b/release/scripts/compat20-install.sh
index 0ad5ea66..ba85baa 100755
--- a/release/scripts/compat20-install.sh
+++ b/release/scripts/compat20-install.sh
@@ -4,5 +4,5 @@ if [ "`id -u`" != "0" ]; then
 	echo "Sorry, this must be done as root."
 	exit 1
 fi
-cat compat20.?? | tar --unlink -xpzf - -C /
+cat compat20.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
 exit 0
diff --git a/release/scripts/compat21-install.sh b/release/scripts/compat21-install.sh
index abf9bc2..8fcd15d 100755
--- a/release/scripts/compat21-install.sh
+++ b/release/scripts/compat21-install.sh
@@ -4,5 +4,5 @@ if [ "`id -u`" != "0" ]; then
 	echo "Sorry, this must be done as root."
 	exit 1
 fi
-cat compat21.?? | tar --unlink -xpzf - -C /
+cat compat21.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
 exit 0
diff --git a/release/scripts/des-install.sh b/release/scripts/des-install.sh
index c1fdedc..13d7fdc 100755
--- a/release/scripts/des-install.sh
+++ b/release/scripts/des-install.sh
@@ -4,16 +4,18 @@ if [ "`id -u`" != "0" ]; then
 	echo "Sorry, this must be done as root."
 	exit 1
 fi
-echo "You are about to extract the DES distribution into / - are you SURE"
-echo "you want to do this over your installed system?  If not, hit ^C now!"
+_DEST=${DESTDIR:-/}
+echo "You are about to extract the DES distribution into ${_DEST} - are you SURE"
+echo "you want to do this over your installed system?  If not, hit ^C now,"
+echo -n "otherwise hit return to continue. "
 read junk
-cat des.?? | tar --unlink -xpzf - -C /
-cat krb.?? | tar --unlink -xpzf - -C /
+cat des.?? | tar --unlink -xpzf - -C ${_DEST}
+cat krb.?? | tar --unlink -xpzf - -C ${_DEST}
 echo -n "Do you want to install the DES sources (y/n)? "
 read ans
 if [ "$ans" = "y" ]; then
-	cat scrypto.?? | tar --unlink -xpzf - -C /usr/src
-	cat skerbero.?? | tar --unlink -xpzf - -C /usr/src
-	cat ssecure.?? | tar --unlink -xpzf - -C /usr/src
+	cat scrypto.?? | tar --unlink -xpzf - -C ${_DEST}/usr/src
+	cat skerbero.?? | tar --unlink -xpzf - -C ${_DEST}/usr/src
+	cat ssecure.?? | tar --unlink -xpzf - -C ${_DEST}/usr/src
 fi
 exit 0
diff --git a/release/scripts/dict-install.sh b/release/scripts/dict-install.sh
index e86c744..eeb6c99 100755
--- a/release/scripts/dict-install.sh
+++ b/release/scripts/dict-install.sh
@@ -4,5 +4,5 @@ if [ "`id -u`" != "0" ]; then
 	echo "Sorry, this must be done as root."
 	exit 1
 fi
-cat dict.?? | tar --unlink -xpzf - -C /
+cat dict.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
 exit 0
diff --git a/release/scripts/doc-install.sh b/release/scripts/doc-install.sh
index 371312c..aae982f 100755
--- a/release/scripts/doc-install.sh
+++ b/release/scripts/doc-install.sh
@@ -4,9 +4,9 @@ if [ "`id -u`" != "0" ]; then
 	echo "Sorry, this must be done as root."
 	exit 1
 fi
-echo "You are about to extract the doc distribution into / - are you SURE"
+echo "You are about to extract the doc distribution into ${DESTDIR:-/} - are you SURE"
 echo -n "you want to do this over your installed system (y/n)? "
 read ans
 if [ "$ans" = "y" ]; then
-	cat doc.?? | tar --unlink -xpzf - -C /
+	cat doc.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
 fi
diff --git a/release/scripts/games-install.sh b/release/scripts/games-install.sh
index 1b907b2..6602d1c 100755
--- a/release/scripts/games-install.sh
+++ b/release/scripts/games-install.sh
@@ -4,5 +4,5 @@ if [ "`id -u`" != "0" ]; then
 	echo "Sorry, this must be done as root."
 	exit 1
 fi
-cat games.?? | tar --unlink -xpzf - -C /
+cat games.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
 exit 0
diff --git a/release/scripts/info-install.sh b/release/scripts/info-install.sh
index 7248df6..2ae15df 100755
--- a/release/scripts/info-install.sh
+++ b/release/scripts/info-install.sh
@@ -4,5 +4,5 @@ if [ "`id -u`" != "0" ]; then
 	echo "Sorry, this must be done as root."
 	exit 1
 fi
-cat info.?? | tar --unlink -xpzf - -C /
+cat info.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
 exit 0
diff --git a/release/scripts/manpages-install.sh b/release/scripts/manpages-install.sh
index 6ba0092..d429315 100755
--- a/release/scripts/manpages-install.sh
+++ b/release/scripts/manpages-install.sh
@@ -4,5 +4,5 @@ if [ "`id -u`" != "0" ]; then
 	echo "Sorry, this must be done as root."
 	exit 1
 fi
-cat manpages.?? | tar --unlink -xpzf - -C /
+cat manpages.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
 exit 0
diff --git a/release/scripts/ports-install.sh b/release/scripts/ports-install.sh
index 22d2246..810bab0 100755
--- a/release/scripts/ports-install.sh
+++ b/release/scripts/ports-install.sh
@@ -4,5 +4,6 @@ if [ "`id -u`" != "0" ]; then
 	echo "Sorry, this must be done as root."
 	exit 1
 fi
-cat ports.tgz | tar --unlink -xpzf - -C /usr
+echo "Extracting ports tarball into ${DESTDIR}/usr"
+cat ports.tgz | tar --unlink -xpzf - -C ${DESTDIR}/usr
 exit 0
diff --git a/release/scripts/proflibs-install.sh b/release/scripts/proflibs-install.sh
index afcd5c5..ce410e3 100755
--- a/release/scripts/proflibs-install.sh
+++ b/release/scripts/proflibs-install.sh
@@ -4,5 +4,5 @@ if [ "`id -u`" != "0" ]; then
 	echo "Sorry, this must be done as root."
 	exit 1
 fi
-cat proflibs.?? | tar --unlink -xpzf - -C /
+cat proflibs.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
 exit 0
diff --git a/release/scripts/src-install.sh b/release/scripts/src-install.sh
index a7b593b..f31b68c 100755
--- a/release/scripts/src-install.sh
+++ b/release/scripts/src-install.sh
@@ -21,8 +21,10 @@ else
 	dists="$*"
 fi
 
+echo "Extracting sources into ${DESTDIR}/usr/src..."
 for i in $dists; do
-	echo "Extracting source component: $i"
-	cat s${i}.?? | tar --unlink -xpzf - -C /usr/src
+	echo "  Extracting source component: $i"
+	cat s${i}.?? | tar --unlink -xpzf - -C ${DESTDIR}/usr/src
 done
+echo "Done extracting sources."
 exit 0
diff --git a/release/scripts/xperimnt-install.sh b/release/scripts/xperimnt-install.sh
index e998c0f..2c55654 100755
--- a/release/scripts/xperimnt-install.sh
+++ b/release/scripts/xperimnt-install.sh
@@ -4,5 +4,6 @@ if [ "`id -u`" != "0" ]; then
 	echo "Sorry, this must be done as root."
 	exit 1
 fi
-tar --unlink -xpzf xperimnt.tgz -C /usr/local
+echo "Extracting xperimnt tarball into ${DESTDIR}/usr/local"
+tar --unlink -xpzf xperimnt.tgz -C ${DESTDIR}/usr/local
 exit 0