From dc61380dc008073e2de02edf6bebb07a9d633cc9 Mon Sep 17 00:00:00 2001 From: ceriel Date: Wed, 16 Oct 1991 13:33:38 +0000 Subject: [PATCH] many changes --- first/first | 40 +++++++++++++++++++++++----------------- first/get_sys | 8 ++++---- first/install_tail | 2 +- first/limit_enquire | 30 +++++++++++++++++++++--------- first/limit_impl | 1 - first/mk_config | 30 +----------------------------- first/mk_target | 2 -- 7 files changed, 50 insertions(+), 63 deletions(-) diff --git a/first/first b/first/first index 88d2088ba..58d99d171 100755 --- a/first/first +++ b/first/first @@ -155,7 +155,7 @@ do '') ANS="$LIMIT";; esac case X$ANS in - Xj*|Xy*) + Xj*|Xy|X*) LIMIT=y . $FDIR/limit_enquire break @@ -172,24 +172,30 @@ done . $FDIR/get_makepars -echo TARGET_HOME=\"$TARGET_HOME\" > macros -echo UTIL_HOME=\"$UTIL_HOME\" >> macros -echo SRC_HOME=\"$SRC_HOME\" >> macros -echo SYSNAME=\"$SYSNAME\" >> macros -echo ACM=\"$ACM\" >> macros -echo CURRENT=\"$CURRENT\" >> macros -echo SYS=\"$SYS\" >> macros -echo LIMIT=\"$LIMIT\" >> macros -echo CONFIG=\"$CONFIG\" >> macros -echo DISABLE_LANG=\"$DISABLE_LANG\" >> macros -echo DISABLE_SUP=\"$DISABLE_SUP\" >> macros -echo DO_MACHINE_INDEP=\"$DO_MACHINE_INDEP\" >> macros -echo MACH_LIST=\"$MACH_LIST\" >> macros -echo SYSVAX=\"$SYSVAX\" >> macros -echo WS=\"$WS\" >> macros -echo PS=\"$PS\" >> macros +echo "TARGET_HOME=\"$TARGET_HOME\"; export TARGET_HOME" > macros +echo "UTIL_HOME=\"$UTIL_HOME\"; export UTIL_HOME" >> macros +echo "SRC_HOME=\"$SRC_HOME\"; export SRC_HOME" >> macros +echo "SYSNAME=\"$SYSNAME\"; export SYSNAME" >> macros +echo "ACM=\"$ACM\"; export ACM" >> macros +echo "CURRENT=\"$CURRENT\"; export CURRENT" >> macros +echo "SYS=\"$SYS\"; export SYS" >> macros +echo "LIMIT=\"$LIMIT\"; export LIMIT" >> macros +echo "CONFIG=\"$CONFIG\"; export CONFIG" >> macros +echo "DISABLE_LANG=\"$DISABLE_LANG\"; export DISABLE_LANG" >> macros +echo "DISABLE_SUP=\"$DISABLE_SUP\"; export DISABLE_SUP" >> macros +echo "DO_MACHINE_INDEP=\"$DO_MACHINE_INDEP\"; export DO_MACHINE_INDEP" >> macros +echo "MACH_LIST=\"$MACH_LIST\"; export MACH_LIST" >> macros +echo "SYSVAX=\"$SYSVAX\"; export SYSVAX" >> macros +echo "WS=\"$WS\"; export WS" >> macros +echo "PS=\"$PS\"; export PS" >> macros cat macros $FDIR/install_tail > INSTALL chmod +x INSTALL +echo " +A shell-script called 'INSTALL' has been created. Running it +installs ACK. Note that this may take a (very) long time, so run it +in the background, with its output redirected, f.i.: + sh INSTALL > INSTALL.out 2>&1 & +" exit 0 diff --git a/first/get_sys b/first/get_sys index f8b002a0d..c8389148b 100755 --- a/first/get_sys +++ b/first/get_sys @@ -1,4 +1,4 @@ -$FDIR/rm -f em_path.h +rm -f em_path.h echo "You will now be asked for the root directory of the ACK sources. This directory will not be changed by the installation process. " @@ -98,12 +98,12 @@ do case $ANS in '') ANS="$CURRENT";; esac -case $ANS in -j*|y*) UTIL_HOME=$TARGET_HOME +case X$ANS in +Xj*|Xy*|X) UTIL_HOME=$TARGET_HOME CURRENT=y break ;; -n*) CURRENT=n +Xn*) CURRENT=n echo "You will now be asked for the root directory of ACK on the current machine. This tree will not be changed by the installation process. " diff --git a/first/install_tail b/first/install_tail index 4eba3bdf4..ca389738b 100644 --- a/first/install_tail +++ b/first/install_tail @@ -3,7 +3,7 @@ set -e PATH=::$SRC_HOME/first:$UTIL_HOME/bin:/bin:/usr/bin:/usr/ucb export PATH -mk_config $CONFIG $SRC_HOME `pwd`/make_macros +mk_config `pwd`/make_macros mk_target diff --git a/first/limit_enquire b/first/limit_enquire index fca0fae82..b93baed9a 100644 --- a/first/limit_enquire +++ b/first/limit_enquire @@ -11,11 +11,15 @@ to disable installation of the machine-independent part" case $ANS in '') ANS="$DO_MACHINE_INDEP" ;; esac - case $ANS in - j*|y*) DO_MACHINE_INDEP=y + case X$ANS in + Xj*|Xy*|X) DO_MACHINE_INDEP=y + echo "machine-independent part will be installed" + echo break ;; - n*) DO_MACHINE_INDEP=n + Xn*) DO_MACHINE_INDEP=n + echo "machine-independent part will not be installed" + echo break ;; *) ./echo "I do not understand your answer ($ANS). Try again." @@ -30,12 +34,16 @@ do . $FDIR/get_answer case X$ANS in Xj*|Xy*|X) + echo "$i will be installed" + echo break ;; Xn*) DISABLE_LANG=$DISABLE_LANG" $i" + echo "$i will not be installed" + echo break ;; - *) ./echo "I do not understand your answer ($ANS). Try again." + *) echo "I do not understand your answer ($ANS). Try again." ;; esac done @@ -47,20 +55,22 @@ do while : do case $1 in - i86) ./echo "not installing i86 will disable installation of xenix3 and minix." + i86) echo "not installing i86 will disable installation of xenix3 and minix." ;; - m68k2) ./echo "not installing m68k2 will disable installation of pmds, minixST, + m68k2) echo "not installing m68k2 will disable installation of pmds, minixST, m68k4, pmds4, sun2, and mantra." ;; - m68k4) ./echo "not installing m68k4 will disable installation of pmds4, sun2, and mantra." + m68k4) echo "not installing m68k4 will disable installation of pmds4, sun2, and mantra." ;; - m68020) ./echo "not installing m68020 will disable installation of sun3." + m68020) echo "not installing m68020 will disable installation of sun3." ;; esac ./echo -n "Do you want to install the $1 support? (y/n) " . $FDIR/get_answer case X$ANS in Xj*|Xy*|X) + echo "The $1 support will be installed" + echo case $1 in vax4) case $SYSNAME in vax_bsd4_1a) SYSVAX=libbsd4_1a @@ -71,7 +81,7 @@ m68k4, pmds4, sun2, and mantra." ;; *) if [ $DO_MACHINE_INDEP = y ] then - . get_sysvax + . $FDIR/get_sysvax fi ;; esac @@ -79,6 +89,8 @@ m68k4, pmds4, sun2, and mantra." break ;; Xn*) DISABLE_SUP=$DISABLE_SUP" $1" + echo "The $1 support will not be installed" + echo case $1 in i86) shift diff --git a/first/limit_impl b/first/limit_impl index e31b85f62..a28a0691a 100755 --- a/first/limit_impl +++ b/first/limit_impl @@ -1,4 +1,3 @@ -. macros for i in $DISABLE_LANG do ed - $CONFIG/Action <&2 - exit 1 - ;; -esac - -CONFIG=$1 -SRC_HOME=$2 -MACROS=$3 - -if [ -d $SRC_HOME ] -then : -else echo "$0: $SRC_HOME is not a directory" 1>&2 - exit 2 -fi +MACROS=$1 if [ -f $MACROS ] then : @@ -29,13 +8,6 @@ else echo "$0: $MACROS not found" 1>&2 exit 3 fi -case ${CONFIG}XX${MACROS}XX${SRC_HOME} in -/*XX/*XX/*) ;; -*) echo "$0: all arguments should be absolute path names" 1>&2 - exit 4 - ;; -esac - create_dir $CONFIG cd $SRC_HOME diff --git a/first/mk_target b/first/mk_target index 38d9f6da7..f3ca878a1 100755 --- a/first/mk_target +++ b/first/mk_target @@ -1,7 +1,5 @@ set -e -. macros - : machine-dependant stuff create_dir $TARGET_HOME -- 2.34.1