diff options
| author | Florent Villard <warly@mandriva.com> | 2003-02-28 10:06:36 +0000 |
|---|---|---|
| committer | Florent Villard <warly@mandriva.com> | 2003-02-28 10:06:36 +0000 |
| commit | 364b2bf2f8a906233a5e0f9f2d566c89a7e7905c (patch) | |
| tree | 63ba5033213d2d694f9d309cc4c09139e19bd588 /drakwizard.pl | |
| parent | de7d38fc1dd5bd19682f0b4042238223b79f7e18 (diff) | |
| download | drakwizard-364b2bf2f8a906233a5e0f9f2d566c89a7e7905c.tar drakwizard-364b2bf2f8a906233a5e0f9f2d566c89a7e7905c.tar.gz drakwizard-364b2bf2f8a906233a5e0f9f2d566c89a7e7905c.tar.bz2 drakwizard-364b2bf2f8a906233a5e0f9f2d566c89a7e7905c.tar.xz drakwizard-364b2bf2f8a906233a5e0f9f2d566c89a7e7905c.zip | |
- change Makefile not to change __WIZ_HOME__ in drakwizard.pl before installation
- add apache2 wizard
Diffstat (limited to 'drakwizard.pl')
| -rwxr-xr-x | drakwizard.pl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drakwizard.pl b/drakwizard.pl index 69846a2c..9583ddc7 100755 --- a/drakwizard.pl +++ b/drakwizard.pl @@ -44,7 +44,7 @@ my $standalone = 1; # '/etc/sysconfig/network-scripts/drakconnect_conf'); if (!defined($ARGV[0])) { - my $prefix = "__WIZ_HOME__/"; + my $prefix = "__WIZ_HOME__"; my %wiz = ( 1 => [$prefix."web_wizard/web.wiz", "Apache"], 2 => [$prefix."dhcp_wizard/dhcp.wiz", "Dhcp"], @@ -56,12 +56,13 @@ if (!defined($ARGV[0])) { 8 => [$prefix."ftp_wizard/ftp.wiz", "Proftpd"], 9 => [$prefix."samba_wizard/samba.wiz", "Samba"], 10 => [$prefix."proxy_wizard/proxy.wiz", "Squid"], - 11 => [$prefix."time_wizard/time.wiz", "Time"] + 11 => [$prefix."time_wizard/time.wiz", "Time"], + 12 => [$prefix."web_wizard/apache2.wiz", "Apache2"] ); $in->ask_from( N("Drakwizard wizard selection"), N("Please select a wizard"), - [{ val => \$ARGV[0], list => [sort keys %wiz], format => sub { $wiz{$_[0]}[1] }}] + [{ val => \$ARGV[0], list => [sort { $wiz{$a}[2] cmp $wiz{$b}[2] } keys %wiz], format => sub { $wiz{$_[0]}[1] }}] ); $ARGV[0] = $wiz{$ARGV[0]}[0]; } |