diff options
| author | Frederic Crozat <fcrozat@mandriva.com> | 2002-08-22 16:36:52 +0000 |
|---|---|---|
| committer | Frederic Crozat <fcrozat@mandriva.com> | 2002-08-22 16:36:52 +0000 |
| commit | 8cb296dff1704b8b7247ebe8635a54e8336edb58 (patch) | |
| tree | 4bd459fded1b169683083342e433debb98e16e9c /proxy_wizard | |
| parent | 232ed05f74df058f955466b13b779e2624fd8f22 (diff) | |
| download | drakwizard-8cb296dff1704b8b7247ebe8635a54e8336edb58.tar drakwizard-8cb296dff1704b8b7247ebe8635a54e8336edb58.tar.gz drakwizard-8cb296dff1704b8b7247ebe8635a54e8336edb58.tar.bz2 drakwizard-8cb296dff1704b8b7247ebe8635a54e8336edb58.tar.xz drakwizard-8cb296dff1704b8b7247ebe8635a54e8336edb58.zip | |
Fix search and replace for __WIZ_HOME__ and fix wrongly committed files
Diffstat (limited to 'proxy_wizard')
| -rw-r--r-- | proxy_wizard/proxy.wiz | 24 | ||||
| -rw-r--r-- | proxy_wizard/scripts/Squidconf.pm | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/proxy_wizard/proxy.wiz b/proxy_wizard/proxy.wiz index 4532209f..cd264303 100644 --- a/proxy_wizard/proxy.wiz +++ b/proxy_wizard/proxy.wiz @@ -3,11 +3,11 @@ <Wizard name="general" - libScript="/usr/share/wizards/common/scripts/functions.sh" + libScript="__WIZ_HOME__/common/scripts/functions.sh" wizardTitle="Squid wizard" imagePosition="top" - defaultImage="/usr/share/wizards/proxy_wizard/images/proxy" - perlModule="/usr/share/wizards/proxy_wizard/scripts/Squidconf.pm" + defaultImage="__WIZ_HOME__/proxy_wizard/images/proxy" + perlModule="__WIZ_HOME__/proxy_wizard/scripts/Squidconf.pm" rpm="squid" > @@ -86,7 +86,7 @@ <Page name="Welcome" helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.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" @@ -206,7 +206,7 @@ <Page name="port" helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html" - jumpScript="/usr/share/wizards/proxy_wizard/scripts/testport.sh" + jumpScript="__WIZ_HOME__/proxy_wizard/scripts/testport.sh" executionLevel="NORMAL" nextFinish="false" canBack="true" @@ -309,7 +309,7 @@ <Info comment="free space on disk" - fillScript="/usr/share/wizards/proxy_wizard/scripts/dfh.sh" + fillScript="__WIZ_HOME__/proxy_wizard/scripts/dfh.sh" > </Info> @@ -318,7 +318,7 @@ <Page name="ask_level" helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html" - jumpScript="/usr/share/wizards/proxy_wizard/scripts/echolevel.sh $wiz_squid_level" + jumpScript="__WIZ_HOME__/proxy_wizard/scripts/echolevel.sh $wiz_squid_level" executionLevel="NORMAL" nextFinish="false" canBack="true" @@ -412,7 +412,7 @@ <Info - fillScript="/usr/share/wizards/proxy_wizard/scripts/printservices.sh" + fillScript="__WIZ_HOME__/proxy_wizard/scripts/printservices.sh" > </Info> @@ -463,7 +463,7 @@ <Page name="cachepeer" helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html" - jumpScript="/usr/share/wizards/proxy_wizard/scripts/echolevel.sh $wiz_squid_menupeer" + jumpScript="__WIZ_HOME__/proxy_wizard/scripts/echolevel.sh $wiz_squid_menupeer" executionLevel="NORMAL" nextFinish="false" canBack="true" @@ -624,7 +624,7 @@ <Freetext name="s_level" - fillScript="/usr/share/wizards/proxy_wizard/scripts/showlevel.sh $wiz_squid_level" + fillScript="__WIZ_HOME__/proxy_wizard/scripts/showlevel.sh $wiz_squid_level" helpText="Access Control:" editable="false" > @@ -716,7 +716,7 @@ <Freetext name="s_level" variableName="wiz_squid_mynetw" - fillScript="/usr/share/wizards/proxy_wizard/scripts/showlevel.sh $wiz_squid_level" + fillScript="__WIZ_HOME__/proxy_wizard/scripts/showlevel.sh $wiz_squid_level" helpText="Access Control:" editable="false" > @@ -820,7 +820,7 @@ <Page name="error_need_net" helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.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/proxy_wizard/scripts/Squidconf.pm b/proxy_wizard/scripts/Squidconf.pm index e7788fec..fa99558d 100644 --- a/proxy_wizard/scripts/Squidconf.pm +++ b/proxy_wizard/scripts/Squidconf.pm @@ -1,15 +1,15 @@ #!/usr/bin/perl package Squidconf; -require "/usr/share/wizards/common/scripts/Vareqval.pm"; -require "/usr/share/wizards/common/scripts/Varspaceval.pm"; +require "__WIZ_HOME__/common/scripts/Vareqval.pm"; +require "__WIZ_HOME__/common/scripts/Varspaceval.pm"; use MDK::Common; use strict; sub do_it_squid { my $file="/etc/squid/squid.conf"; -f $file and MDK::Common::cp_af($file, $file.".orig"); - MDK::Common::cp_af("/usr/share/wizards/proxy_wizard/scripts/squid.conf.default", $file); + MDK::Common::cp_af("__WIZ_HOME__/proxy_wizard/scripts/squid.conf.default", $file); print "$ENV{wiz_squid_defdir}\n"; substInFile { s|^\s*\#?\s*(cache_dir.*$ENV{wiz_squid_defdir}\s*)\d*(.*)|$1$ENV{wiz_squid_disk}$2|; |