From 8cb296dff1704b8b7247ebe8635a54e8336edb58 Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Thu, 22 Aug 2002 16:36:52 +0000 Subject: Fix search and replace for __WIZ_HOME__ and fix wrongly committed files --- Makefile | 8 ++++++-- client_wizard/client.wiz | 12 ++++++------ client_wizard/scripts/Clientconf.pm | 2 +- common/scripts/DrakconnectConf.pm | 2 +- db_wizard/db.wiz | 12 ++++++------ dhcp_wizard/dhcp.wiz | 18 +++++++++--------- dhcp_wizard/scripts/Dhcpconf.pm | 4 ++-- dns_wizard/dns.wiz | 12 ++++++------ dns_wizard/scripts/Dnsconf.pm | 16 ++++++++-------- firewall_wizard/firewall.wiz | 18 +++++++++--------- firewall_wizard/scripts/FWconf.pm | 4 ++-- ftp_wizard/ftp.wiz | 6 +++--- ftp_wizard/scripts/Ftpconf.pm | 2 +- ftp_wizard/scripts/ProFtpconf.pm | 4 ++-- news_wizard/news.wiz | 14 +++++++------- news_wizard/scripts/Newsconf.pm | 6 +++--- postfix_wizard/postfix.wiz | 18 +++++++++--------- postfix_wizard/scripts/Postfixconf.pm | 4 ++-- proxy_wizard/proxy.wiz | 24 ++++++++++++------------ proxy_wizard/scripts/Squidconf.pm | 6 +++--- samba_wizard/samba.wiz | 16 ++++++++-------- samba_wizard/scripts/Smbconf.pm | 6 +++--- server_wizard/scripts/Serverconf.pm | 2 +- server_wizard/server.wiz | 26 +++++++++++++------------- time_wizard/time.wiz | 22 +++++++++++----------- web_wizard/scripts/Webconf.pm | 4 ++-- web_wizard/web.wiz | 6 +++--- 27 files changed, 139 insertions(+), 135 deletions(-) diff --git a/Makefile b/Makefile index b4fd267f..11913748 100644 --- a/Makefile +++ b/Makefile @@ -19,16 +19,20 @@ WIZ = common\ data\ po +all: + + # installs all the wizards... install: - find -regex ".*\.wiz$$\|.*.pm$$\|.*\.sh$$" -exec \ - perl -pi -e "s|__WIZ_HOME__|/usr/share/wizards|g" \{\} \; mkdir -p ${prefix}/sbin install -p drakwizard.pl ${prefix}/sbin/drakwizard for l in $(WIZ); do \ $(MAKE) -C $$l $@; \ done + find ${prefix}/share/wizards -regex ".*\.wiz$$\|.*.pm$$\|.*\.sh$$" -exec \ + perl -pi -e "s|__WIZ_HOME__|/usr/share/wizards|g" \{\} \; + clean: $(MAKE) -C po $@ diff --git a/client_wizard/client.wiz b/client_wizard/client.wiz index a1cceb86..0bb0317d 100644 --- a/client_wizard/client.wiz +++ b/client_wizard/client.wiz @@ -3,11 +3,11 @@ @@ -34,7 +34,7 @@ @@ -30,7 +30,7 @@ @@ -119,7 +119,7 @@ @@ -152,7 +152,7 @@ $tmp") or die "can't open $tmp: $!"; - open(OLD, "< /usr/share/wizards/dhcp_wizard/scripts/dhcpd.conf.default") or + open(OLD, "< __WIZ_HOME__/dhcp_wizard/scripts/dhcpd.conf.default") or die "can't open default: $!"; while () { s|__hname__|$wiz_host_name|g; diff --git a/dns_wizard/dns.wiz b/dns_wizard/dns.wiz index 2c986df0..f7b9f68c 100644 --- a/dns_wizard/dns.wiz +++ b/dns_wizard/dns.wiz @@ -3,11 +3,11 @@ @@ -329,7 +329,7 @@ needed to configure your firewall:" + my %conf = ("__WIZ_HOME__/firewall_wizard/scripts/bastille-firewall.cfg.default" => "/etc/Bastille/bastille-firewall.cfg", "/usr/share/Bastille/bastille-firewall" => "/etc/init.d/bastille-firewall", "/usr/share/Bastille/bastille_ipchains" => "/sbin/bastille-ipchains", diff --git a/ftp_wizard/ftp.wiz b/ftp_wizard/ftp.wiz index 1903b3ec..113c2518 100644 --- a/ftp_wizard/ftp.wiz +++ b/ftp_wizard/ftp.wiz @@ -3,11 +3,11 @@ diff --git a/ftp_wizard/scripts/Ftpconf.pm b/ftp_wizard/scripts/Ftpconf.pm index fdd05119..a2c57f04 100644 --- a/ftp_wizard/scripts/Ftpconf.pm +++ b/ftp_wizard/scripts/Ftpconf.pm @@ -1,7 +1,7 @@ #!/usr/bin/perl package Ftpconf; -require "/usr/share/wizards/common/scripts/Vareqval.pm"; +require "__WIZ_HOME__/common/scripts/Vareqval.pm"; use MDK::Common; use strict; diff --git a/ftp_wizard/scripts/ProFtpconf.pm b/ftp_wizard/scripts/ProFtpconf.pm index 8954d356..ec596a88 100644 --- a/ftp_wizard/scripts/ProFtpconf.pm +++ b/ftp_wizard/scripts/ProFtpconf.pm @@ -1,10 +1,10 @@ #!/usr/bin/perl package ProFtpconf; -require "/usr/share/wizards/common/scripts/DrakconnectConf.pm"; +require "__WIZ_HOME__/common/scripts/DrakconnectConf.pm"; use MDK::Common; use strict; -require "/usr/share/wizards/common/scripts/Vareqval.pm"; +require "__WIZ_HOME__/common/scripts/Vareqval.pm"; sub true { my ($val) = @_; diff --git a/news_wizard/news.wiz b/news_wizard/news.wiz index 478c7c2e..497b0ce4 100644 --- a/news_wizard/news.wiz +++ b/news_wizard/news.wiz @@ -3,11 +3,11 @@ $tmp") or die "can't open $tmp: $!"; @@ -60,7 +60,7 @@ sub do_it { my $file = "/etc/leafnode/crontab"; my $tmp = `mktemp /tmp/Newsconf.XXXXXX` or die "can't make a temp file: $!"; - open(OLD, "< /usr/share/wizards/news_wizard/scripts/news.cron") + open(OLD, "< __WIZ_HOME__/news_wizard/scripts/news.cron") or die "can't open default: $!"; open(NEW, "> $tmp") or die "can't open $tmp: $!"; diff --git a/postfix_wizard/postfix.wiz b/postfix_wizard/postfix.wiz index 66715a05..c0930fa1 100644 --- a/postfix_wizard/postfix.wiz +++ b/postfix_wizard/postfix.wiz @@ -3,11 +3,11 @@ @@ -26,7 +26,7 @@ @@ -290,7 +290,7 @@ needed to configure your Internet Mail Service:" @@ -327,7 +327,7 @@ needed to configure your Internet Mail Service:" @@ -86,7 +86,7 @@ @@ -318,7 +318,7 @@ @@ -463,7 +463,7 @@ @@ -716,7 +716,7 @@ @@ -820,7 +820,7 @@ @@ -42,7 +42,7 @@ get_from_known_dev("IP"); diff --git a/server_wizard/scripts/Serverconf.pm b/server_wizard/scripts/Serverconf.pm index 2af5647d..4f70e74a 100644 --- a/server_wizard/scripts/Serverconf.pm +++ b/server_wizard/scripts/Serverconf.pm @@ -1,7 +1,7 @@ #!/usr/bin/perl package Serverconf; -require "/usr/share/wizards/common/scripts/Vareqval.pm"; +require "__WIZ_HOME__/common/scripts/Vareqval.pm"; use MDK::Common; use strict; diff --git a/server_wizard/server.wiz b/server_wizard/server.wiz index 47e7319c..14fab983 100644 --- a/server_wizard/server.wiz +++ b/server_wizard/server.wiz @@ -3,11 +3,11 @@ @@ -345,7 +345,7 @@ @@ -426,7 +426,7 @@ @@ -471,7 +471,7 @@ -- cgit v1.2.1