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
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
|
*** Count-config.orig Fri May 3 06:20:27 1996
--- Count-config Fri Sep 6 18:05:28 1996
***************
*** 20,26 ****
trap 'echo '';echo "Interrupt Detected..exiting";rm -f "./Config.tmpl" 2>/dev/null;rm -f "./.alfcf" ;rm -f "./strict" 2>/dev/null;echo '';exit 1' 1 2 3 15
Tmpl="./Config.tmpl"
! CgiBinDir="/usr/local/etc/httpd/cgi-bin"
if [ ! -f "./VERSION" ]
then
--- 20,26 ----
trap 'echo '';echo "Interrupt Detected..exiting";rm -f "./Config.tmpl" 2>/dev/null;rm -f "./.alfcf" ;rm -f "./strict" 2>/dev/null;echo '';exit 1' 1 2 3 15
Tmpl="./Config.tmpl"
! CgiBinDir="${PREFIX}/www/cgi-bin"
if [ ! -f "./VERSION" ]
then
***************
*** 36,48 ****
Version=`cat ./VERSION`
Basedir="wwwcount$Version"
ConfigH="config.h"
! BaseDir="/usr/local/etc/Counter"
ConfigDir="conf"
ConfFile="count.cfg"
DigitDir="digits"
DataDir="data"
! LogDir="Log"
! LogFile="Count$Version.log"
RgbFile="./wcount/rgb.txt"
#allow_f_cr=0
#strict_mode=0
--- 36,49 ----
Version=`cat ./VERSION`
Basedir="wwwcount$Version"
ConfigH="config.h"
! BaseDir="${PREFIX}/etc/Counter"
! LibDir="${PREFIX}/lib/Counter"
ConfigDir="conf"
ConfFile="count.cfg"
DigitDir="digits"
DataDir="data"
! LogDir="/var/log"
! LogFile="Counter.log"
RgbFile="./wcount/rgb.txt"
#allow_f_cr=0
#strict_mode=0
***************
*** 114,120 ****
if [ .$answer = . ]
then
! answer=x
fi
until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
do
--- 115,121 ----
if [ .$answer = . ]
then
! answer=y
fi
until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
do
***************
*** 245,251 ****
You need to enter the directory of the Log file.
EOB
! echo $n "*Log directory [$BaseDir/$LogDir]:$c "
read newpath
if [ .$newpath != . ]
then
--- 246,252 ----
You need to enter the directory of the Log file.
EOB
! echo $n "*Log directory [$LogDir]:$c "
read newpath
if [ .$newpath != . ]
then
***************
*** 289,299 ****
echo "++++++++++++++++++++++++++++++"
echo "CgiBinDir=$CgiBinDir"
echo "BaseDir= $BaseDir"
! echo "DigitDir= $BaseDir/$DigitDir"
echo "ConfDir = $BaseDir/$ConfigDir"
echo "ConfFile= $ConfFile"
echo "DataDir= $BaseDir/$DataDir"
! echo "LogDir= $BaseDir/$LogDir"
echo "LogFile= $LogFile"
echo "++++++++++++++++++++++++++++++"
--- 290,300 ----
echo "++++++++++++++++++++++++++++++"
echo "CgiBinDir=$CgiBinDir"
echo "BaseDir= $BaseDir"
! echo "DigitDir= $LibDir/$DigitDir"
echo "ConfDir = $BaseDir/$ConfigDir"
echo "ConfFile= $ConfFile"
echo "DataDir= $BaseDir/$DataDir"
! echo "LogDir= $LogDir"
echo "LogFile= $LogFile"
echo "++++++++++++++++++++++++++++++"
***************
*** 302,308 ****
if [ .$answer = . ]
then
! answer=x
fi
until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
do
--- 303,309 ----
if [ .$answer = . ]
then
! answer=y
fi
until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
do
***************
*** 338,345 ****
echo "#define ConfigDir \"$BaseDir/$ConfigDir\"" >> $ConfigH
echo "#define ConfigFile \"$ConfFile\"" >> $ConfigH
echo "#define DataDir \"$BaseDir/$DataDir\"" >> $ConfigH
! echo "#define DigitDir \"$BaseDir/$DigitDir\"" >> $ConfigH
! echo "#define LogDir \"$BaseDir/$LogDir\"" >> $ConfigH
echo "#define LogFile \"$LogFile\"" >> $ConfigH
cat<<EOX>>$ConfigH
--- 339,346 ----
echo "#define ConfigDir \"$BaseDir/$ConfigDir\"" >> $ConfigH
echo "#define ConfigFile \"$ConfFile\"" >> $ConfigH
echo "#define DataDir \"$BaseDir/$DataDir\"" >> $ConfigH
! echo "#define DigitDir \"$LibDir/$DigitDir\"" >> $ConfigH
! echo "#define LogDir \"$LogDir\"" >> $ConfigH
echo "#define LogFile \"$LogFile\"" >> $ConfigH
cat<<EOX>>$ConfigH
***************
*** 381,387 ****
* so RGB names can be looked up, but yet not allow users to make constant
* use of this very ineffiecient lookup.
*****************************************************************************/
! #define RgbMappingDict "$BaseDir/rgb.txt"
EOX
#if [ $allow_f_cr -eq 1 ]
--- 382,388 ----
* so RGB names can be looked up, but yet not allow users to make constant
* use of this very ineffiecient lookup.
*****************************************************************************/
! #define RgbMappingDict "$LibDir/rgb.txt"
EOX
#if [ $allow_f_cr -eq 1 ]
***************
*** 413,427 ****
##
echo "creating variables template file $Tmpl for the install program.."
echo "BASE_DIR=\"$BaseDir\"" > $Tmpl
echo "CGIBIN_DIR=\"$CgiBinDir\"" >> $Tmpl
echo "CONFIG_FILE=\"$ConfFile\"" >> $Tmpl
echo "CONFIG_DIR=\"$BaseDir/$ConfigDir\"" >> $Tmpl
! echo "DIGIT_DIR=\"$BaseDir/$DigitDir\"" >> $Tmpl
echo "DATA_DIR=\"$BaseDir/$DataDir\"" >> $Tmpl
! echo "LOG_DIR=\"$BaseDir/$LogDir\"" >> $Tmpl
echo "LOG_FILE=\"$LogFile\"" >> $Tmpl
echo "RGB_FILE=\"$RgbFile\"" >> $Tmpl
! echo "RGB_DIR=\"$BaseDir\"" >> $Tmpl
##
# create template for install program --ends
##
--- 414,429 ----
##
echo "creating variables template file $Tmpl for the install program.."
echo "BASE_DIR=\"$BaseDir\"" > $Tmpl
+ echo "LIB_DIR=\"$LibDir\"" >> $Tmpl
echo "CGIBIN_DIR=\"$CgiBinDir\"" >> $Tmpl
echo "CONFIG_FILE=\"$ConfFile\"" >> $Tmpl
echo "CONFIG_DIR=\"$BaseDir/$ConfigDir\"" >> $Tmpl
! echo "DIGIT_DIR=\"$LibDir/$DigitDir\"" >> $Tmpl
echo "DATA_DIR=\"$BaseDir/$DataDir\"" >> $Tmpl
! echo "LOG_DIR=\"$LogDir\"" >> $Tmpl
echo "LOG_FILE=\"$LogFile\"" >> $Tmpl
echo "RGB_FILE=\"$RgbFile\"" >> $Tmpl
! echo "RGB_DIR=\"$LibDir\"" >> $Tmpl
##
# create template for install program --ends
##
|
