--- setup.sh.orig 2022-05-23 20:33:54 UTC +++ setup.sh @@ -103,19 +103,7 @@ echo "" 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]: " -if [ "$config_dir" = "" ]; then - read config_dir -fi -if [ "$config_dir" = "" ]; then - config_dir=/etc/webmin -fi -abspath=`echo $config_dir | grep "^/"` -if [ "$abspath" = "" ]; then - echo "Config directory must be an absolute path" - echo "" - exit 2 -fi +config_dir=/usr/local/etc/webmin if [ ! -d $config_dir ]; then mkdir $config_dir; if [ $? != 0 ]; then @@ -210,12 +198,12 @@ else fi # 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 @@ -243,7 +231,9 @@ else 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 %%PERL%% ]; then + perldef=%%PERL%% + elif [ -x /usr/bin/perl ]; then perldef=/usr/bin/perl elif [ -x /usr/local/bin/perl ]; then perldef=/usr/local/bin/perl @@ -444,6 +434,7 @@ else fi fi + atboot=0 # Ask whether to run at boot time if [ "$atboot" = "" ]; then if echo "$os_type" | grep -q "\-linux$"; then @@ -595,6 +586,7 @@ fi fi fi +noperlpath="yes" if [ "$noperlpath" = "" ]; then echo "Inserting path to perl into scripts.." (find "$wadir" -name '*.cgi' -print ; find "$wadir" -name '*.pl' -print) | $perl "$wadir/perlpath.pl" $perl - @@ -607,7 +599,6 @@ echo "#!/bin/sh" >>$config_dir/.start-init echo "Creating start and stop init scripts.." # Start main echo "#!/bin/sh" >>$config_dir/.start-init -echo "echo Starting Webmin server in $wadir" >>$config_dir/.start-init echo "trap '' 1" >>$config_dir/.start-init echo "LANG=" >>$config_dir/.start-init echo "export LANG" >>$config_dir/.start-init @@ -827,6 +818,7 @@ fi echo passdelay=1 >> $config_dir/miniserv.conf fi +nouninstall="yes" if [ "$nouninstall" = "" ]; then echo "Creating uninstall script $config_dir/uninstall.sh .." cat >$config_dir/uninstall.sh <