f6584c0665
The setup script was hanging during package upgrades because it tried to ask the configuration path again.
89 lines
2.0 KiB
Bash
89 lines
2.0 KiB
Bash
--- setup.sh.orig
|
|
+++ setup.sh
|
|
@@ -13,6 +13,13 @@
|
|
bootscript="webmin"
|
|
fi
|
|
|
|
+nostart="yes"
|
|
+nostop="yes"
|
|
+nochown="yes"
|
|
+nouninstall="yes"
|
|
+noperlpath="yes"
|
|
+atboot=0
|
|
+
|
|
cd `dirname $0`
|
|
if [ -x /bin/pwd ]; then
|
|
wadir=`/bin/pwd`
|
|
@@ -113,15 +120,16 @@
|
|
echo ""
|
|
envetcdir="$config_dir"
|
|
if [ "$envetcdir" = "" ]; then
|
|
- envetcdir=/etc/webmin
|
|
+ envetcdir=%%PREFIX%%/etc/webmin
|
|
envetcdirnotfound=1
|
|
fi
|
|
printf "Config file directory [$envetcdir]: "
|
|
if [ "$config_dir" = "" ]; then
|
|
- read config_dir
|
|
+ config_dir="$envetcdir"
|
|
+ echo "$envetcdir"
|
|
fi
|
|
if [ "$config_dir" = "" ]; then
|
|
- config_dir=/etc/webmin
|
|
+ config_dir=%%PREFIX%%/etc/webmin
|
|
fi
|
|
abspath=`echo $config_dir | grep "^/"`
|
|
if [ "$abspath" = "" ]; then
|
|
@@ -232,7 +240,7 @@
|
|
else
|
|
# Config directory exists .. make sure it is not in use
|
|
ls $config_dir | grep -v rpmsave >/dev/null 2>&1
|
|
- if [ "$?" = "0" -a "$config_dir" != "/etc/webmin" ]; then
|
|
+ if [ "$?" = "0" -a "$config_dir" != "%%PREFIX%%/etc/webmin" ]; then
|
|
echo "ERROR: Config directory $config_dir is not empty"
|
|
echo ""
|
|
exit 2
|
|
@@ -241,15 +249,16 @@
|
|
# Ask for log directory
|
|
envvardir="$var_dir"
|
|
if [ "$envvardir" = "" ]; then
|
|
- envvardir=/var/webmin
|
|
+ envvardir=/var/db/webmin
|
|
envvardirnotfound=1
|
|
fi
|
|
printf "Log file directory [$envvardir]: "
|
|
if [ "$var_dir" = "" ]; then
|
|
- read var_dir
|
|
+ var_dir="$envvardir"
|
|
+ echo "$envvardir"
|
|
fi
|
|
if [ "$var_dir" = "" ]; then
|
|
- var_dir=/var/webmin
|
|
+ var_dir=/var/db/webmin
|
|
fi
|
|
abspath=`echo $var_dir | grep "^/"`
|
|
if [ "$abspath" = "" ]; then
|
|
@@ -290,7 +299,8 @@
|
|
if [ "$perl" = "" ]; then
|
|
if [ "$perldef" = "" ]; then
|
|
printf "Full path to perl: "
|
|
- read perl
|
|
+ perl="%%PERL%%"
|
|
+ echo "$perl"
|
|
if [ "$perl" = "" ]; then
|
|
echo "ERROR: No path entered!"
|
|
echo ""
|
|
@@ -298,10 +308,8 @@
|
|
fi
|
|
else
|
|
printf "Full path to perl (default $perldef): "
|
|
- read perl
|
|
- if [ "$perl" = "" ]; then
|
|
- perl=$perldef
|
|
- fi
|
|
+ perl=$perldef
|
|
+ echo "$perldef"
|
|
fi
|
|
fi
|
|
echo ""
|