1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
|
*** install.sh.orig Sat May 23 00:31:42 1998
--- install.sh Wed Aug 12 17:24:14 1998
***************
*** 46,51 ****
--- 46,54 ----
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
#
***************
*** 594,600 ****
while :
do
! if getstr "\nEnter X binary directory\n[${BINDIR}]:"
then
if [ -d "$ANS" ]
then
--- 597,607 ----
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
***************
*** 642,648 ****
while :
do
! if getstr "\nEnter X library directory\n[${LIBDIR}]:"
then
if [ -d "$ANS" ]
then
--- 649,659 ----
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
***************
*** 665,671 ****
APPDEFAULTSDIR=$LIBDIR/app-defaults
while :
do
! if getstr "\nEnter X app-defaults directory\n[${APPDEFAULTSDIR}]:"
then
if [ -d "$ANS" ]
then
--- 676,686 ----
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
***************
*** 688,694 ****
XMCDLIB=$LIBDIR/xmcd
while :
do
! if getstr "\nEnter xmcd library directory\n[${XMCDLIB}]:"
then
UDIR="$ANS"
if [ -d "$UDIR" ]
--- 703,713 ----
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
UDIR="$ANS"
if [ -d "$UDIR" ]
***************
*** 742,748 ****
$ECHO "\n\nThe on-line manual directory is where the man pages in"
$ECHO "in the xmcd package will be installed."
! if getstr "\nEnter on-line manual directory\n[${MANDIR}]:"
then
MANDIR=$ANS
fi
--- 761,770 ----
$ECHO "\n\nThe on-line manual directory is where the man pages in"
$ECHO "in the xmcd package will be installed."
! if [ -n "$NO_PROMPT" ]
! then
! $ECHO "xmcd on-line manual directory - using ${MANDIR}"
! elif getstr "\nEnter on-line manual directory\n[${MANDIR}]:"
then
MANDIR=$ANS
fi
***************
*** 767,773 ****
MANSUFFIX=1
fi
! if getstr "\nEnter on-line manual file name suffix\n[${MANSUFFIX}]:"
then
MANSUFFIX=$ANS
fi
--- 789,798 ----
MANSUFFIX=1
fi
! 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
***************
*** 939,954 ****
fi
# Run device-dependent config script
- if [ -r $XMCDLIB/config/config.sh ]
- then
- $SHELL $XMCDLIB/config/config.sh
- if [ $? != 0 ]
- then
- logerr -n "$XMCDLIB/config/config.sh failed."
- fi
- else
- logerr -p "Cannot execute $XMCDLIB/config/config.sh"
- fi
# Demo cddb file
if [ -d $XMCDLIB/cddb/misc ]
--- 964,969 ----
|
