aboutsummaryrefslogtreecommitdiff
path: root/release/scripts
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2002-04-23 22:16:41 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2002-04-23 22:16:41 +0000
commit01df2ec3284983bfe28031d1c86c13ffd4a21b7e (patch)
tree3eee8dd61f995528c0a9e5d0ffb9521208186643 /release/scripts
parent046eb0421efae11e9abc90815592fe370c77c8e6 (diff)
downloadsrc-01df2ec3284983bfe28031d1c86c13ffd4a21b7e.tar.gz
src-01df2ec3284983bfe28031d1c86c13ffd4a21b7e.zip
Change the name of the 'bin' distribution to 'base'.
This is done since it contains much more than /bin, and also gets in the way when making a combined install+fixit CD. OK'ed by: jkh
Notes
Notes: svn path=/head/; revision=95327
Diffstat (limited to 'release/scripts')
-rwxr-xr-xrelease/scripts/base-install.sh2
-rwxr-xr-xrelease/scripts/bin-install.sh2
-rwxr-xr-xrelease/scripts/dict-make.sh10
-rwxr-xr-xrelease/scripts/doc-make.sh6
-rwxr-xr-xrelease/scripts/games-make.sh18
-rwxr-xr-xrelease/scripts/info-make.sh6
-rwxr-xr-xrelease/scripts/manpages-make.sh8
-rwxr-xr-xrelease/scripts/proflibs-make.sh2
8 files changed, 27 insertions, 27 deletions
diff --git a/release/scripts/base-install.sh b/release/scripts/base-install.sh
index 5d6fc4517fa3..c87a38bf86a9 100755
--- a/release/scripts/base-install.sh
+++ b/release/scripts/base-install.sh
@@ -12,5 +12,5 @@ echo "You are about to extract the base distribution into ${DESTDIR:-/} - are yo
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 ${DESTDIR:-/}
+ cat base.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
fi
diff --git a/release/scripts/bin-install.sh b/release/scripts/bin-install.sh
index 5d6fc4517fa3..c87a38bf86a9 100755
--- a/release/scripts/bin-install.sh
+++ b/release/scripts/bin-install.sh
@@ -12,5 +12,5 @@ echo "You are about to extract the base distribution into ${DESTDIR:-/} - are yo
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 ${DESTDIR:-/}
+ cat base.?? | tar --unlink -xpzf - -C ${DESTDIR:-/}
fi
diff --git a/release/scripts/dict-make.sh b/release/scripts/dict-make.sh
index 355d6ffcb328..2e4d3220eb76 100755
--- a/release/scripts/dict-make.sh
+++ b/release/scripts/dict-make.sh
@@ -4,15 +4,15 @@
#
# Move the dict stuff out to its own dist
-if [ -d ${RD}/trees/bin/usr/share/dict ]; then
- tar -cf - -C ${RD}/trees/bin/usr/share/dict . |
+if [ -d ${RD}/trees/base/usr/share/dict ]; then
+ tar -cf - -C ${RD}/trees/base/usr/share/dict . |
tar -xpf - -C ${RD}/trees/dict/usr/share/dict &&
- rm -rf ${RD}/trees/bin/usr/share/dict;
+ rm -rf ${RD}/trees/base/usr/share/dict;
fi
for i in airport birthtoken flowers inter.phone na.phone zipcodes; do
- if [ -f ${RD}/trees/bin/usr/share/misc/$i ]; then
- mv ${RD}/trees/bin/usr/share/misc/$i \
+ if [ -f ${RD}/trees/base/usr/share/misc/$i ]; then
+ mv ${RD}/trees/base/usr/share/misc/$i \
${RD}/trees/dict/usr/share/misc;
fi;
done
diff --git a/release/scripts/doc-make.sh b/release/scripts/doc-make.sh
index 2cb4029e6ec8..033554007abe 100755
--- a/release/scripts/doc-make.sh
+++ b/release/scripts/doc-make.sh
@@ -4,8 +4,8 @@
#
# Create the doc dist.
-if [ -d ${RD}/trees/bin/usr/share/doc ]; then
- ( cd ${RD}/trees/bin/usr/share/doc;
+if [ -d ${RD}/trees/base/usr/share/doc ]; then
+ ( cd ${RD}/trees/base/usr/share/doc;
find . | cpio -dumpl ${RD}/trees/doc/usr/share/doc ) &&
- rm -rf ${RD}/trees/bin/usr/share/doc
+ rm -rf ${RD}/trees/base/usr/share/doc
fi
diff --git a/release/scripts/games-make.sh b/release/scripts/games-make.sh
index de839e28a36f..6e83d1474737 100755
--- a/release/scripts/games-make.sh
+++ b/release/scripts/games-make.sh
@@ -4,22 +4,22 @@
#
# Move all the games out to their own dist
-if [ -d ${RD}/trees/bin/usr/games ]; then
- tar -cf - -C ${RD}/trees/bin/usr/games . |
+if [ -d ${RD}/trees/base/usr/games ]; then
+ tar -cf - -C ${RD}/trees/base/usr/games . |
tar -xpf - -C ${RD}/trees/games/usr/games &&
- rm -rf ${RD}/trees/bin/usr/games;
+ rm -rf ${RD}/trees/base/usr/games;
fi
-if [ -d ${RD}/trees/bin/usr/share/games ]; then
- tar -cf - -C ${RD}/trees/bin/usr/share/games . |
+if [ -d ${RD}/trees/base/usr/share/games ]; then
+ tar -cf - -C ${RD}/trees/base/usr/share/games . |
tar -xpf - -C ${RD}/trees/games/usr/share/games &&
- rm -rf ${RD}/trees/bin/usr/share/games;
+ rm -rf ${RD}/trees/base/usr/share/games;
fi
-if [ -d ${RD}/trees/bin/var/games ]; then
- tar -cf - -C ${RD}/trees/bin/var/games . |
+if [ -d ${RD}/trees/base/var/games ]; then
+ tar -cf - -C ${RD}/trees/base/var/games . |
tar -xpf - -C ${RD}/trees/games/var/games &&
- rm -rf ${RD}/trees/bin/var/games;
+ rm -rf ${RD}/trees/base/var/games;
fi
if [ -d ${RD}/trees/manpages/usr/share/man/man6 ]; then
diff --git a/release/scripts/info-make.sh b/release/scripts/info-make.sh
index faa3d0c7efe6..12fd29d93873 100755
--- a/release/scripts/info-make.sh
+++ b/release/scripts/info-make.sh
@@ -4,8 +4,8 @@
#
# Move the info files out to their own dist
-if [ -d ${RD}/trees/bin/usr/share/info ]; then
- tar -cf - -C ${RD}/trees/bin/usr/share/info . |
+if [ -d ${RD}/trees/base/usr/share/info ]; then
+ tar -cf - -C ${RD}/trees/base/usr/share/info . |
tar -xpf - -C ${RD}/trees/info/usr/share/info &&
- rm -rf ${RD}/trees/bin/usr/share/info;
+ rm -rf ${RD}/trees/base/usr/share/info;
fi
diff --git a/release/scripts/manpages-make.sh b/release/scripts/manpages-make.sh
index fae9dd3487b7..bb1326f3d506 100755
--- a/release/scripts/manpages-make.sh
+++ b/release/scripts/manpages-make.sh
@@ -3,10 +3,10 @@
# $FreeBSD$
#
-# Move all the manpages out to their own dist, using the bin dist as a
+# Move all the manpages out to their own dist, using the base dist as a
# starting point.
-if [ -d ${RD}/trees/bin/usr/share/man ]; then
- ( cd ${RD}/trees/bin/usr/share/man;
+if [ -d ${RD}/trees/base/usr/share/man ]; then
+ ( cd ${RD}/trees/base/usr/share/man;
find . | cpio -dumpl ${RD}/trees/manpages/usr/share/man > /dev/null 2>&1) &&
- rm -rf ${RD}/trees/bin/usr/share/man;
+ rm -rf ${RD}/trees/base/usr/share/man;
fi
diff --git a/release/scripts/proflibs-make.sh b/release/scripts/proflibs-make.sh
index 0c5e699897e5..e03b8b2bb551 100755
--- a/release/scripts/proflibs-make.sh
+++ b/release/scripts/proflibs-make.sh
@@ -4,7 +4,7 @@
#
# Move the profiled libraries out to their own dist
-for i in ${RD}/trees/bin/usr/lib/*_p.a; do
+for i in ${RD}/trees/base/usr/lib/*_p.a; do
if [ -f $i ]; then
mv $i ${RD}/trees/proflibs/usr/lib;
fi;