1999-12-25 11:04:35 +00:00
|
|
|
--- setup.sh.orig Mon Dec 13 12:57:41 1999
|
|
|
|
|
+++ setup.sh Tue Dec 14 10:20:32 1999
|
|
|
|
|
@@ -33,12 +33,12 @@
|
1998-11-19 21:38:24 +00:00
|
|
|
echo "Unless you want to run multiple versions of Webmin at the same time"
|
|
|
|
|
echo "you can just accept the defaults."
|
|
|
|
|
echo ""
|
|
|
|
|
-printf "Config file directory [/etc/webmin]: "
|
|
|
|
|
+printf "Config file directory [!!PREFIX!!/etc/webmin]: "
|
1999-12-25 11:04:35 +00:00
|
|
|
if [ "$config_dir" = "" ]; then
|
|
|
|
|
read config_dir
|
|
|
|
|
fi
|
1998-11-19 21:38:24 +00:00
|
|
|
if [ "$config_dir" = "" ]; then
|
|
|
|
|
- config_dir=/etc/webmin
|
|
|
|
|
+ config_dir=!!PREFIX!!/etc/webmin
|
|
|
|
|
fi
|
1999-12-25 11:04:35 +00:00
|
|
|
abspath=`echo $config_dir | grep "^/"`
|
|
|
|
|
if [ "$abspath" = "" ]; then
|
|
|
|
|
@@ -106,12 +106,12 @@
|
|
|
|
|
fi
|
1998-11-19 21:38:24 +00:00
|
|
|
else
|
|
|
|
|
# Ask for log directory
|
|
|
|
|
- printf "Log file directory [/var/webmin]: "
|
|
|
|
|
+ printf "Log file directory [/var/log/webmin]: "
|
1999-12-25 11:04:35 +00:00
|
|
|
if [ "$var_dir" = "" ]; then
|
|
|
|
|
read var_dir
|
|
|
|
|
fi
|
1998-11-19 21:38:24 +00:00
|
|
|
if [ "$var_dir" = "" ]; then
|
|
|
|
|
- var_dir=/var/webmin
|
|
|
|
|
+ var_dir=/var/log/webmin
|
|
|
|
|
fi
|
1999-12-25 11:04:35 +00:00
|
|
|
abspath=`echo $var_dir | grep "^/"`
|
|
|
|
|
if [ "$abspath" = "" ]; then
|
|
|
|
|
@@ -135,7 +135,9 @@
|
1998-11-19 21:38:24 +00:00
|
|
|
echo "Webmin is written entirely in Perl. Please enter the full path to the"
|
|
|
|
|
echo "Perl 5 interpreter on your system."
|
|
|
|
|
echo ""
|
|
|
|
|
- if [ -x /usr/bin/perl ]; then
|
|
|
|
|
+ if [ -x !!PERL5!! ]; then
|
|
|
|
|
+ perldef=!!PERL5!!
|
|
|
|
|
+ elif [ -x /usr/bin/perl ]; then
|
|
|
|
|
perldef=/usr/bin/perl
|
|
|
|
|
elif [ -x /usr/local/bin/perl ]; then
|
|
|
|
|
perldef=/usr/local/bin/perl
|
