141 lines
3.4 KiB
Plaintext
141 lines
3.4 KiB
Plaintext
*** Count-config.orig Fri Sep 10 13:26:09 1999
|
|
--- Count-config Fri Sep 10 13:40:21 1999
|
|
***************
|
|
*** 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
|
|
***************
|
|
*** 37,50 ****
|
|
Version=`cat ./VERSION`
|
|
Basedir="wwwcount$Version"
|
|
ConfigH="src/config.h"
|
|
! BaseDir="/usr/local/etc/Counter"
|
|
ConfigDir="$BaseDir/conf"
|
|
ConfFile="count.cfg"
|
|
! DigitDir="$BaseDir/digits"
|
|
DataDir="$BaseDir/data"
|
|
! LogDir="$BaseDir/logs"
|
|
! ext=`echo $Version | sed 's/\./_/g'`
|
|
! LogFile="Count$ext.log"
|
|
RgbFile="./data/rgb.txt"
|
|
|
|
#
|
|
--- 37,50 ----
|
|
Version=`cat ./VERSION`
|
|
Basedir="wwwcount$Version"
|
|
ConfigH="src/config.h"
|
|
! BaseDir="${PREFIX}/etc/Counter"
|
|
! LibDir="${PREFIX}/lib/Counter"
|
|
ConfigDir="$BaseDir/conf"
|
|
ConfFile="count.cfg"
|
|
! DigitDir="$LibDir/digits"
|
|
DataDir="$BaseDir/data"
|
|
! LogDir="/var/log"
|
|
! LogFile="Counter.log"
|
|
RgbFile="./data/rgb.txt"
|
|
|
|
#
|
|
***************
|
|
*** 118,124 ****
|
|
|
|
if [ .$answer = . ]
|
|
then
|
|
! answer=x
|
|
fi
|
|
until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
|
|
do
|
|
--- 118,124 ----
|
|
|
|
if [ .$answer = . ]
|
|
then
|
|
! answer=y
|
|
fi
|
|
until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
|
|
do
|
|
***************
|
|
*** 186,194 ****
|
|
then
|
|
BaseDir=$newpath
|
|
ConfigDir=$BaseDir/conf
|
|
- DigitDir=$BaseDir/digits
|
|
DataDir=$BaseDir/data
|
|
- LogDir=$BaseDir/logs
|
|
fi
|
|
|
|
#
|
|
--- 186,192 ----
|
|
***************
|
|
*** 377,383 ****
|
|
|
|
if [ .$answer = . ]
|
|
then
|
|
! answer=x
|
|
fi
|
|
until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
|
|
do
|
|
--- 375,381 ----
|
|
|
|
if [ .$answer = . ]
|
|
then
|
|
! answer=y
|
|
fi
|
|
until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
|
|
do
|
|
***************
|
|
*** 519,525 ****
|
|
** so RGB names can be looked up, but yet not allow users to make constant
|
|
** use of this very ineffiecient lookup.
|
|
*/
|
|
! #define RGB_MAPPING_DICT "$BaseDir/rgb.txt"
|
|
EOX
|
|
|
|
cat<<EOXXX>>$ConfigH
|
|
--- 517,523 ----
|
|
** so RGB names can be looked up, but yet not allow users to make constant
|
|
** use of this very ineffiecient lookup.
|
|
*/
|
|
! #define RGB_MAPPING_DICT "$LibDir/rgb.txt"
|
|
EOX
|
|
|
|
cat<<EOXXX>>$ConfigH
|
|
***************
|
|
*** 540,545 ****
|
|
--- 538,544 ----
|
|
echo "CGIBIN_DIR=\"$CgiBinDir\"" > $Tmpl
|
|
|
|
echo "BASE_DIR=\"$BaseDir\"" >> $Tmpl
|
|
+ echo "LIB_DIR=\"$LibDir\"" >> $Tmpl
|
|
echo "CONFIG_FILE=\"$ConfFile\"" >> $Tmpl
|
|
echo "CONFIG_DIR=\"$ConfigDir\"" >> $Tmpl
|
|
echo "DIGIT_DIR=\"$DigitDir\"" >> $Tmpl
|
|
***************
|
|
*** 547,553 ****
|
|
echo "LOG_DIR=\"$LogDir\"" >> $Tmpl
|
|
echo "LOG_FILE=\"$LogFile\"" >> $Tmpl
|
|
echo "RGB_FILE=\"$RgbFile\"" >> $Tmpl
|
|
! echo "RGB_DIR=\"$BaseDir\"" >> $Tmpl
|
|
##
|
|
# create template for install program --ends
|
|
##
|
|
--- 546,552 ----
|
|
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
|
|
##
|