Fix search and replace for __WIZ_HOME__ and fix wrongly committed files

2 files changed, 14 insertions, 14 deletions

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 @@
 
 <Wizard
 	name="general"
-	libScript="/usr/share/wizards/common/scripts/functions.sh"
+	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="DNS Wizard"
 	imagePosition="top"
-	defaultImage="/usr/share/wizards/dns_wizard/images/DNS"
-	perlModule="/usr/share/wizards/dns_wizard/scripts/Dnsconf.pm"
+	defaultImage="__WIZ_HOME__/dns_wizard/images/DNS"
+	perlModule="__WIZ_HOME__/dns_wizard/scripts/Dnsconf.pm"
 >
 
 	<Variable
@@ -27,7 +27,7 @@
 	<Page
 		name="Welcome"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dns.html"
-		jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
+		jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -73,7 +73,7 @@
 	<Page
 		name="DNS"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dns.html"
-		jumpScript="/usr/share/wizards/dns_wizard/scripts/check_ext_dns.sh"
+		jumpScript="__WIZ_HOME__/dns_wizard/scripts/check_ext_dns.sh"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -206,7 +206,7 @@
 	<Page
 		name="error_need_net"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dns.html"
-		subWizard="/usr/share/wizards/server_wizard/server.wiz"
+		subWizard="__WIZ_HOME__/server_wizard/server.wiz"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="false"
diff --git a/dns_wizard/scripts/Dnsconf.pm b/dns_wizard/scripts/Dnsconf.pm
index 59ffee9b..f5a00abb 100644
--- a/dns_wizard/scripts/Dnsconf.pm
+++ b/dns_wizard/scripts/Dnsconf.pm
@@ -1,8 +1,8 @@
 #!/usr/bin/perl
 
 package Dnsconf;
-require "/usr/share/wizards/common/scripts/Vareqval.pm";
-require "/usr/share/wizards/common/scripts/DrakconnectConf.pm";
+require "__WIZ_HOME__/common/scripts/Vareqval.pm";
+require "__WIZ_HOME__/common/scripts/DrakconnectConf.pm";
 use MDK::Common;
 use strict;
 use standalone;
@@ -39,7 +39,7 @@ sub	do_it {
     my $file = "/etc/host.conf";
     
     MDK::Common::cp_af($file, $file.".orig");
-    MDK::Common::cp_af("/usr/share/wizards/dns_wizard/scripts/host.conf.default", $file);
+    MDK::Common::cp_af("__WIZ_HOME__/dns_wizard/scripts/host.conf.default", $file);
     
     $file = "/etc/named.conf";
     MDK::Common::cp_af($file, $file.".orig");
@@ -56,14 +56,14 @@ sub	do_it {
 	s|__revnet__|$reversnet|g;
 	s|__net__|$s_trunc|g;
 	$_;
-    } cat_("/usr/share/wizards/dns_wizard/scripts/named.conf.default"));
+    } cat_("__WIZ_HOME__/dns_wizard/scripts/named.conf.default"));
 # Bug fix for bind 9:
     if (! -f "/etc/rndc.key") { system("touch /etc/rndc.key") or die "can not touch /etc/rndc.key"};
 
 # root.hints
     $file="/var/named/root.hints";
     -f $file and MDK::Common::cp_af($file, $file . ".orig");
-    MDK::Common::cp_af("/usr/share/wizards/dns_wizard/scripts/root.hints.default", $file);
+    MDK::Common::cp_af("__WIZ_HOME__/dns_wizard/scripts/root.hints.default", $file);
 
 # 127.0.0.rev
     $file="/var/named/127.0.0.rev";
@@ -71,7 +71,7 @@ sub	do_it {
     output($file, map {
 	s|__hname__|$wiz_host_name|g;
 	$_;
-    } cat_("/usr/share/wizards/dns_wizard/scripts/127.0.0.rev.default"));
+    } cat_("__WIZ_HOME__/dns_wizard/scripts/127.0.0.rev.default"));
     up_serial($file);
     
 # $ipnet.rev
@@ -83,7 +83,7 @@ sub	do_it {
 	s|__revnet__|$reversnet|g;
 	s|__nb__|$ds|g;
 	$_;
-    } cat_("/usr/share/wizards/dns_wizard/scripts/ipnet.rev.default"));
+    } cat_("__WIZ_HOME__/dns_wizard/scripts/ipnet.rev.default"));
     up_serial($file);
     
 # $domain.db
@@ -96,7 +96,7 @@ sub	do_it {
 	s|__host__|$host|g;
 	s|__nb__|$ds|g;
 	$_;
-    } cat_("/usr/share/wizards/dns_wizard/scripts/domain.db.default"));
+    } cat_("__WIZ_HOME__/dns_wizard/scripts/domain.db.default"));
     up_serial($file);
 
 #resolv.conf