aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils/webmin/files/patch-aa
blob: 92d5509242cb2da3bd5b6cb6c30a690c92638ab5 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126

$FreeBSD$

--- setup.sh.orig
+++ setup.sh
@@ -15,16 +15,8 @@
 srcdir=$wadir
 ver=`cat "$wadir/version"`
 
-# Find temp directory
-if [ "$tempdir" = "" ]; then
-   tempdir=/tmp/.webmin
-fi
-
-if [ $? != "0" ]; then
-   echo "ERROR: Cannot find the Webmin install directory";
-   echo "";
-   exit 1;
-fi
+tempdir=/tmp/.webmin
+mkdir -p $tempdir
 
 echo "***********************************************************************"
 echo "*            Welcome to the Webmin setup script, version $ver        *"
@@ -95,19 +87,7 @@
 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
@@ -207,12 +187,12 @@
    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
@@ -240,7 +220,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
@@ -439,22 +421,6 @@
        fi
    fi
 
-   # Ask whether to run at boot time
-   if [ "$atboot" = "" ]; then
-       initsupp=`grep "^os_support=" "$srcdir/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
-               makeboot=1
-           fi
-       else
-           echo "Webmin does not support being started at boot time on your system."
-       fi
-   fi
-
    # Copy files to target directory
    echo "***********************************************************************"
    if [ "$wadir" != "$srcdir" ]; then
@@ -576,6 +542,7 @@
    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 -
@@ -586,7 +553,6 @@
 echo "Creating start and stop scripts.."
 rm -f $config_dir/stop $config_dir/start $config_dir/restart $config_dir/reload
 echo "#!/bin/sh" >>$config_dir/start
-echo "echo Starting Webmin server in $wadir" >>$config_dir/start
 echo "trap '' 1" >>$config_dir/start
 echo "LANG=" >>$config_dir/start
 echo "export LANG" >>$config_dir/start
@@ -734,6 +700,7 @@
    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 <<EOF
@@ -823,6 +790,7 @@
    . "$srcdir/setup-post.sh"
 fi
 
+nostart="yes"
 if [ "$nostart" = "" ]; then
    if [ "$inetd" != "1" ]; then
        echo "Attempting to start Webmin mini web server.."