--- setup.sh.orig Mon Dec 13 12:57:41 1999 +++ setup.sh Tue Dec 14 10:20:32 1999 @@ -33,12 +33,12 @@ 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]: " if [ "$config_dir" = "" ]; then read config_dir fi if [ "$config_dir" = "" ]; then - config_dir=/etc/webmin + config_dir=!!PREFIX!!/etc/webmin fi abspath=`echo $config_dir | grep "^/"` if [ "$abspath" = "" ]; then @@ -106,12 +106,12 @@ fi else # Ask for log directory - printf "Log file directory [/var/webmin]: " + printf "Log file directory [/var/log/webmin]: " if [ "$var_dir" = "" ]; then read var_dir fi if [ "$var_dir" = "" ]; then - var_dir=/var/webmin + var_dir=/var/log/webmin fi abspath=`echo $var_dir | grep "^/"` if [ "$abspath" = "" ]; then @@ -135,7 +135,9 @@ 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 @@ -313,11 +315,11 @@ initsupp=`grep "^os_support=" $wadir/init/module.info | sed -e 's/os_support=//g' | grep $os_type` atboot=0 if [ "$initsupp" != "" ]; then - printf "Start Webmin at boot time (y/n): " - read atbootyn - if [ "$atbootyn" = "y" -o "$atbootyn" = "Y" ]; then - atboot=1 - fi + # printf "Start Webmin at boot time (y/n): " + # read atbootyn + # if [ "$atbootyn" = "y" -o "$atbootyn" = "Y" ]; then + # atboot=1 + # fi else echo "Webmin does not support being started at boot time on your system." fi