1997-09-08 13:20:16 +00:00
|
|
|
*** install.sh.orig Tue Aug 12 19:12:27 1997
|
|
|
|
--- install.sh Sun Sep 7 16:23:43 1997
|
1996-12-04 11:06:05 +00:00
|
|
|
***************
|
1997-09-08 13:20:16 +00:00
|
|
|
*** 48,53 ****
|
|
|
|
--- 48,56 ----
|
1996-12-04 11:06:05 +00:00
|
|
|
ERRFILE=/tmp/xmcd.err
|
|
|
|
TMPFILE=/tmp/xmcdinst.$$
|
|
|
|
|
|
|
|
+ # Flag for indicating we do not want to prompt the user if possible.
|
|
|
|
+ NO_PROMPT=1
|
|
|
|
+
|
|
|
|
#
|
|
|
|
# Utility functions
|
|
|
|
#
|
|
|
|
***************
|
1997-09-08 13:20:16 +00:00
|
|
|
*** 586,592 ****
|
1996-12-04 11:06:05 +00:00
|
|
|
|
|
|
|
while :
|
|
|
|
do
|
|
|
|
! if getstr "\nEnter X binary directory\n[${BINDIR}]:"
|
|
|
|
then
|
|
|
|
if [ -d "$ANS" ]
|
|
|
|
then
|
1997-09-08 13:20:16 +00:00
|
|
|
--- 589,599 ----
|
1996-12-04 11:06:05 +00:00
|
|
|
|
|
|
|
while :
|
|
|
|
do
|
|
|
|
! if [ -n "$NO_PROMPT" ]
|
|
|
|
! then
|
|
|
|
! $ECHO "X binary directory - using ${BINDIR}"
|
|
|
|
! break
|
|
|
|
! elif getstr "\nEnter X binary directory\n[${BINDIR}]:"
|
|
|
|
then
|
|
|
|
if [ -d "$ANS" ]
|
|
|
|
then
|
|
|
|
***************
|
1997-09-08 13:20:16 +00:00
|
|
|
*** 634,640 ****
|
1996-12-04 11:06:05 +00:00
|
|
|
|
|
|
|
while :
|
|
|
|
do
|
|
|
|
! if getstr "\nEnter X library directory\n[${LIBDIR}]:"
|
|
|
|
then
|
|
|
|
if [ -d "$ANS" ]
|
|
|
|
then
|
1997-09-08 13:20:16 +00:00
|
|
|
--- 641,651 ----
|
1996-12-04 11:06:05 +00:00
|
|
|
|
|
|
|
while :
|
|
|
|
do
|
|
|
|
! if [ -n "$NO_PROMPT" ]
|
|
|
|
! then
|
|
|
|
! $ECHO "X library directory - using ${LIBDIR}"
|
|
|
|
! break
|
|
|
|
! elif getstr "\nEnter X library directory\n[${LIBDIR}]:"
|
|
|
|
then
|
|
|
|
if [ -d "$ANS" ]
|
|
|
|
then
|
|
|
|
***************
|
1997-09-08 13:20:16 +00:00
|
|
|
*** 657,663 ****
|
1996-12-04 11:06:05 +00:00
|
|
|
APPDEFAULTSDIR=$LIBDIR/app-defaults
|
|
|
|
while :
|
|
|
|
do
|
|
|
|
! if getstr "\nEnter X app-defaults directory\n[${APPDEFAULTSDIR}]:"
|
|
|
|
then
|
|
|
|
if [ -d "$ANS" ]
|
|
|
|
then
|
1997-09-08 13:20:16 +00:00
|
|
|
--- 668,678 ----
|
1996-12-04 11:06:05 +00:00
|
|
|
APPDEFAULTSDIR=$LIBDIR/app-defaults
|
|
|
|
while :
|
|
|
|
do
|
|
|
|
! if [ -n "$NO_PROMPT" ]
|
|
|
|
! then
|
|
|
|
! $ECHO "X app-defaults directory - using ${LIBDIR}"
|
|
|
|
! break
|
|
|
|
! elif getstr "\nEnter X app-defaults directory\n[${APPDEFAULTSDIR}]:"
|
|
|
|
then
|
|
|
|
if [ -d "$ANS" ]
|
|
|
|
then
|
|
|
|
***************
|
1997-09-08 13:20:16 +00:00
|
|
|
*** 680,686 ****
|
|
|
|
XMCDLIB=$LIBDIR/xmcd
|
|
|
|
while :
|
|
|
|
do
|
|
|
|
! if getstr "\nEnter xmcd library directory\n[${XMCDLIB}]:"
|
|
|
|
then
|
|
|
|
if [ -d "$ANS" ]
|
|
|
|
then
|
|
|
|
--- 695,705 ----
|
|
|
|
XMCDLIB=$LIBDIR/xmcd
|
|
|
|
while :
|
|
|
|
do
|
|
|
|
! if [ -n "$NO_PROMPT" ]
|
|
|
|
! then
|
|
|
|
! $ECHO "xmcd library directory - using ${XMCDLIB}"
|
|
|
|
! break
|
|
|
|
! elif getstr "\nEnter xmcd library directory\n[${XMCDLIB}]:"
|
|
|
|
then
|
|
|
|
if [ -d "$ANS" ]
|
|
|
|
then
|
1996-12-04 11:06:05 +00:00
|
|
|
***************
|
1997-09-08 13:20:16 +00:00
|
|
|
*** 733,739 ****
|
|
|
|
$ECHO "\n\nThe on-line manual directory is where the man pages in"
|
|
|
|
$ECHO "in the xmcd package will be installed."
|
1996-12-04 11:06:05 +00:00
|
|
|
|
1997-09-08 13:20:16 +00:00
|
|
|
! if getstr "\nEnter on-line manual directory\n[${MANDIR}]:"
|
1996-12-04 11:06:05 +00:00
|
|
|
then
|
1997-09-08 13:20:16 +00:00
|
|
|
MANDIR=$ANS
|
1996-12-04 11:06:05 +00:00
|
|
|
fi
|
1997-09-08 13:20:16 +00:00
|
|
|
--- 752,761 ----
|
|
|
|
$ECHO "\n\nThe on-line manual directory is where the man pages in"
|
|
|
|
$ECHO "in the xmcd package will be installed."
|
1996-12-04 11:06:05 +00:00
|
|
|
|
|
|
|
! if [ -n "$NO_PROMPT" ]
|
|
|
|
! then
|
1997-09-08 13:20:16 +00:00
|
|
|
! $ECHO "xmcd on-line manual directory - using ${MANDIR}"
|
|
|
|
! elif getstr "\nEnter on-line manual directory\n[${MANDIR}]:"
|
1996-12-04 11:06:05 +00:00
|
|
|
then
|
1997-09-08 13:20:16 +00:00
|
|
|
MANDIR=$ANS
|
1996-12-04 11:06:05 +00:00
|
|
|
fi
|
|
|
|
***************
|
1997-09-08 13:20:16 +00:00
|
|
|
*** 758,764 ****
|
|
|
|
MANSUFFIX=1
|
|
|
|
fi
|
1996-12-04 11:06:05 +00:00
|
|
|
|
1997-09-08 13:20:16 +00:00
|
|
|
! if getstr "\nEnter on-line manual file name suffix\n[${MANSUFFIX}]:"
|
|
|
|
then
|
|
|
|
MANSUFFIX=$ANS
|
|
|
|
fi
|
|
|
|
--- 780,789 ----
|
|
|
|
MANSUFFIX=1
|
|
|
|
fi
|
1996-12-04 11:06:05 +00:00
|
|
|
|
1997-09-08 13:20:16 +00:00
|
|
|
! if [ -n "$NO_PROMPT" ]
|
|
|
|
! then
|
|
|
|
! $ECHO "xmcd on-line manual file name suffix - using ${MANSUFFIX}"
|
|
|
|
! elif getstr "\nEnter on-line manual file name suffix\n[${MANSUFFIX}]:"
|
|
|
|
then
|
|
|
|
MANSUFFIX=$ANS
|
|
|
|
fi
|