simplify and perl_checker style

1 files changed, 20 insertions, 23 deletions

diff --git a/drakwizard.pl b/drakwizard.pl
index 52bbf5f5..fe6425c2 100755
--- a/drakwizard.pl
+++ b/drakwizard.pl
@@ -39,29 +39,26 @@ $::Wiz_more_dir = "/etc/wizard.d/";
 my $in = interactive->vnew;
 
 my %wiz = (
-           apache2 => ['Apache', N("Apache2 web server"), { ver => 2 }],
-           samba => ['Samba', N("Samba server")],
-           sambashare => ['Sambashare', N("Manage Samba share")],
-           sambaprint => ['Sambaprint', N("Manage Samba print")],
-           postfix => ['Postfix', N("Mail server")],
-           );
-
-# display all wizards
--d "/usr/share/wizards/proxy_wizard" and %wiz = (
-                    %wiz,
-                    nisautofs => ['Nisautofs', N("NIS server autofs map")],
-                    installsrv => ['Installsrv', N("Linux Install server")],
-                    ldap => [ 'Ldap', N("ldap server")],
-                    squid => ['Squid', N("Proxy")],
-                    sshd => ['Sshd', N("OpenSSH daemon configuration")],
-                    ntp => ['Ntp', N("Time server")],
-                    dhcp => ['Dhcp', N("DHCP server")],
-                    bind => ['Bind', N("DNS server")],
-                    inn => ['Inn', N("News server")],
-                    nfs => ['NFS', N("NFS server")],
-                    kolab => ['Kolab', N("Kolab server")],
-                    proftpd => ['Proftpd', N("FTP server")],
-                   );
+    apache2 => [ 'Apache', N("Apache2 web server"), { ver => 2 } ],
+    samba => [ 'Samba', N("Samba server") ],
+    sambashare => [ 'Sambashare', N("Manage Samba share") ],
+    sambaprint => [ 'Sambaprint', N("Manage Samba print") ],
+    postfix => [ 'Postfix', N("Mail server") ],
+    if_(all($::Wiz_more_dir),
+        nisautofs => [ 'Nisautofs', N("NIS server autofs map") ],
+        installsrv => [ 'Installsrv', N("Linux Install server") ],
+        ldap => [ 'Ldap', N("ldap server") ],
+        squid => [ 'Squid', N("Proxy") ],
+        sshd => [ 'Sshd', N("OpenSSH daemon configuration") ],
+        ntp => [ 'Ntp', N("Time server") ],
+        dhcp => [ 'Dhcp', N("DHCP server") ],
+        bind => [ 'Bind', N("DNS server") ],
+        inn => [ 'Inn', N("News server") ],
+        nfs => [ 'NFS', N("NFS server") ],
+        kolab => [ 'Kolab', N("Kolab server") ],
+        proftpd => [ 'Proftpd', N("FTP server") ],
+    ),
+);
 
 foreach my $file (glob_("$::Wiz_more_dir/*.conf"))
 {