summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rwxr-xr-xWiztemplate.pm16
-rwxr-xr-xclient_wizard/Bind_client.pm2
-rwxr-xr-xdhcp_wizard/Dhcp.pm2
-rwxr-xr-xdrakwizard.pl9
-rw-r--r--drakwizard.spec10
-rwxr-xr-xftp_wizard/Proftpd.pm2
-rwxr-xr-xnews_wizard/Inn.pm2
-rwxr-xr-xpostfix_wizard/Postfix.pm5
-rwxr-xr-xproxy_wizard/Squid.pm2
-rwxr-xr-xsamba_wizard/Samba.pm2
-rwxr-xr-xweb_wizard/Apache.pm2
12 files changed, 28 insertions, 32 deletions
diff --git a/Makefile b/Makefile
index f5e6ad53..e85ba53d 100644
--- a/Makefile
+++ b/Makefile
@@ -76,10 +76,10 @@ cvstag:
cvs commit
cvs tag $(RELTAG)
-rpm: changelog cvstag dis ../$(NAME)-$(VERSION).tar.bz2 $(RPM)
- cp -f ../$(NAME)-$(VERSION).tar.bz2 $(RPM)/SOURCES
+rpm: changelog cvstag dis ../$(TAR) $(RPM)
+ cp -f ../$(TAR) $(RPM)/SOURCES
-rpm -ba --clean $(NAME).spec
- rm -f ../$(NAME)-$(VERSION).tar.bz2
+ rm -f ../$(TAR)
localrpm: dis
cp -f ../$(TAR) $(RPM)/SOURCES
diff --git a/Wiztemplate.pm b/Wiztemplate.pm
index 4089912f..67183b9b 100755
--- a/Wiztemplate.pm
+++ b/Wiztemplate.pm
@@ -32,7 +32,9 @@ my $o = {
var => {
ip1 => '',
ip2 => ''
- }
+ },
+ needed_packages => [],
+ defaultimage => "$ENV{__WIZ_HOME__}",
};
$o->{pages} = {
@@ -49,20 +51,17 @@ $o->{pages} = {
},
post => \&check,
data => [
- { label => '' },
- { label => N(''), val => \$o->{var}{ip1} },
+ { label => N(''), val => \$o->{var}{ip1} },
{ label => N(''), val => \$o->{var}{ip2} },
],
next => 'summary'
},
warning => {
- name => N('Warning.'),
- data => [ { label => N('') } ],
+ name => N('Warning.') . "\n\n" . N(''),
next => 'summary'
},
error => {
- name => N('Error.'),
- data => [ { label => N('') } ],
+ name => N('Error.') . "\n\n" . N(''),
next => 'config'
},
summary => {
@@ -76,8 +75,7 @@ $o->{pages} = {
next => 'end'
},
end => {
- name => N('Congratulation'),
- data => [ { label => N('') } ],
+ name => N('Congratulations') . "\n\n" . N(''),
end => 1,
next => 0
},
diff --git a/client_wizard/Bind_client.pm b/client_wizard/Bind_client.pm
index 932155ca..9bf84eaa 100755
--- a/client_wizard/Bind_client.pm
+++ b/client_wizard/Bind_client.pm
@@ -92,7 +92,7 @@ $o->{pages} = {
next => 'end'
},
end => {
- name => N('Congratulations') . "\n\n" . N('The wizard successfully added the client.'),
+ name => N('Congratulationss') . "\n\n" . N('The wizard successfully added the client.'),
end => 1,
next => 0
},
diff --git a/dhcp_wizard/Dhcp.pm b/dhcp_wizard/Dhcp.pm
index 7bf306c6..b38ba025 100755
--- a/dhcp_wizard/Dhcp.pm
+++ b/dhcp_wizard/Dhcp.pm
@@ -104,7 +104,7 @@ $o->{pages} = {
next => 'end'
},
end => {
- name => N('Congratulations') . "\n\n" . N('The wizard successfully configured the DHCP services of your server.'),
+ name => N('Congratulationss') . "\n\n" . N('The wizard successfully configured the DHCP services of your server.'),
end => 1,
next => 0
},
diff --git a/drakwizard.pl b/drakwizard.pl
index 72740c0a..093a39bf 100755
--- a/drakwizard.pl
+++ b/drakwizard.pl
@@ -76,6 +76,9 @@ sub wizard {
my $page = $o->{pages}{welcome};
$::Wizard_title = $o->{name};
$::Wizard_pix_up = $o->{defaultimage};
+ if ($> && !$o->{allow_user} && !$::testing) {
+ require_root_capability();
+ }
check_rpm($o->{needed_rpm}) if $o->{needed_rpm};
if (defined $o->{init}) {
my ($res, $msg) = &{$o->{init}};
@@ -84,11 +87,7 @@ sub wizard {
exit if ! $::testing
}
}
- print "root $> allow_user $o->{allow_user} testing $::testing\n";
- if ($> && !$o->{allow_user} && !$::testing) {
- $in->ask_okcancel("error", N('You need to be root to run this wizard'));
- exit;
- }
+
my $next = 'welcome';
my @steps;
while (1) {
diff --git a/drakwizard.spec b/drakwizard.spec
index 8295858e..566736c5 100644
--- a/drakwizard.spec
+++ b/drakwizard.spec
@@ -5,13 +5,13 @@
Name: %{name}
Version: %{version}
Release: %{release}
-Source0: %{name}.tar.bz2
+Source0: %{name}-%{version}.tar.bz2
License: GPL
Group: System/Configuration/Other
-Requires: perl-base, usermode, perl-Locale-gettext, perl-XML-Parser, drakxtools >= 9.1-0.4mdk
+Requires: perl-base, usermode, perl-Locale-gettext, drakxtools >= 9.1-0.4mdk
BuildRequires: gtk+-devel
# perl-XML-Parser needed to extract strings in XML to po
-BuildRequires: gettext-base perl-XML-Parser
+BuildRequires: gettext-base
Buildroot: %{_tmppath}/%{name}
BuildArch: noarch
Prefix: %{_prefix}
@@ -40,8 +40,8 @@ rm -rf $RPM_BUILD_ROOT
%find_lang %{name}
%clean
-#rm -rf $RPM_BUILD_ROOT
-#rm -rf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME
+rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME
%files -f %{name}.lang
%defattr(-,root,root)
diff --git a/ftp_wizard/Proftpd.pm b/ftp_wizard/Proftpd.pm
index 0399966e..45247a33 100755
--- a/ftp_wizard/Proftpd.pm
+++ b/ftp_wizard/Proftpd.pm
@@ -82,7 +82,7 @@ needed to configure your FTP Server') . "\n\n" . N('To accept these values, and
next => 'end'
},
end => {
- name => N('Congratulation') . "\n\n" . N('The wizard successfully configured your Intranet/Internet FTP Server'),
+ name => N('Congratulations') . "\n\n" . N('The wizard successfully configured your Intranet/Internet FTP Server'),
end => 1,
next => 0
},
diff --git a/news_wizard/Inn.pm b/news_wizard/Inn.pm
index 6f585a48..92779f1d 100755
--- a/news_wizard/Inn.pm
+++ b/news_wizard/Inn.pm
@@ -91,7 +91,7 @@ needed to configure your Internet News Service:') . "\n\n" . N('To accept these
next => 'end'
},
end => {
- name => N('Congratulation') . "\n\n" . N('The wizard successfully configured your Internet News service of your server.'),
+ name => N('Congratulations') . "\n\n" . N('The wizard successfully configured your Internet News service of your server.'),
end => 1,
next => 0
},
diff --git a/postfix_wizard/Postfix.pm b/postfix_wizard/Postfix.pm
index 3a04077e..6fac38b0 100755
--- a/postfix_wizard/Postfix.pm
+++ b/postfix_wizard/Postfix.pm
@@ -58,8 +58,7 @@ $o->{pages} = {
next => 'isp'
},
warning => {
- name => N("Warning:") . "\n\n" . N("You entered an empty address for the mail gateway.") . "\n\n" . N("Your choice can be accepted, but this will not allow you to send mail outside your local network. Press next to continue, or back to enter a value.") }
- ],
+ name => N("Warning:") . "\n\n" . N("You entered an empty address for the mail gateway.") . "\n\n" . N("Your choice can be accepted, but this will not allow you to send mail outside your local network. Press next to continue, or back to enter a value."),
next => 'summary'
},
masquerade_not_good => {
@@ -87,7 +86,7 @@ $o->{pages} = {
next => 'end'
},
end => {
- name => N("Congratulations") . "\n\n" . N("The wizard successfully configured your Internet Mail service of your server."),
+ name => N("Congratulationss") . "\n\n" . N("The wizard successfully configured your Internet Mail service of your server."),
end => 1,
next => 0
},
diff --git a/proxy_wizard/Squid.pm b/proxy_wizard/Squid.pm
index 24fc4ad0..89f4cee6 100755
--- a/proxy_wizard/Squid.pm
+++ b/proxy_wizard/Squid.pm
@@ -167,7 +167,7 @@ $o->{pages} = {
next => 'end'
},
end => {
- name => N('Congratulation') . N('The wizard successfully configured your proxy server.'),
+ name => N('Congratulations') . N('The wizard successfully configured your proxy server.'),
end => 1,
next => 0
},
diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm
index 160d2103..ffd79c3f 100755
--- a/samba_wizard/Samba.pm
+++ b/samba_wizard/Samba.pm
@@ -217,7 +217,7 @@ configure Samba.') . "\n\n" . N('To accept these values, and configure your serv
next => 'end'
},
end => {
- name => N('Congratulation') . "\n\n" . N('The wizard successfully configured your Samba server.'),
+ name => N('Congratulations') . "\n\n" . N('The wizard successfully configured your Samba server.'),
end => 1,
next => 0
},
diff --git a/web_wizard/Apache.pm b/web_wizard/Apache.pm
index b6ccaf57..5249446d 100755
--- a/web_wizard/Apache.pm
+++ b/web_wizard/Apache.pm
@@ -139,7 +139,7 @@ available on your http server via http://www.yourserver.com/~user.'), type => 'b
next => 'end'
},
end => {
- name => N('Congratulation'),
+ name => N('Congratulations'),
data => [
{ label => N('The wizard successfully configured your Intranet/Internet Web Server') } ],
end => 1,