summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Crozat <fcrozat@mandriva.com>2002-08-22 16:18:07 +0000
committerFrederic Crozat <fcrozat@mandriva.com>2002-08-22 16:18:07 +0000
commit06f1b01191416ac81e3976938349e7208bf5a557 (patch)
tree56170974ad18df10821bff87b5894ded6f84c393
parent4ded1b990f4c8ec20b47c9020413688cc9c3e9ef (diff)
downloaddrakwizard-06f1b01191416ac81e3976938349e7208bf5a557.tar
drakwizard-06f1b01191416ac81e3976938349e7208bf5a557.tar.gz
drakwizard-06f1b01191416ac81e3976938349e7208bf5a557.tar.bz2
drakwizard-06f1b01191416ac81e3976938349e7208bf5a557.tar.xz
drakwizard-06f1b01191416ac81e3976938349e7208bf5a557.zip
Add support for server-settings: for GNOME 2
-rw-r--r--Makefile1
-rw-r--r--client_wizard/client.wiz12
-rw-r--r--client_wizard/scripts/Clientconf.pm2
-rw-r--r--common/scripts/DrakconnectConf.pm2
-rw-r--r--data/.cvsignore2
-rw-r--r--data/Client.desktop.in7
-rw-r--r--data/DHCP.desktop.in7
-rw-r--r--data/DNS.desktop.in7
-rw-r--r--data/Makefile25
-rw-r--r--data/ServerConfig.directory.in4
-rw-r--r--data/Time.desktop.in7
-rw-r--r--data/Web.desktop.in7
-rw-r--r--data/ftp.desktop.in7
-rwxr-xr-xdata/intltool-merge657
-rw-r--r--data/news.desktop.in7
-rw-r--r--data/postfix.desktop.in7
-rw-r--r--data/proxy.desktop.in7
-rw-r--r--data/samba.desktop.in7
-rw-r--r--data/server-settings.vfolder-info18
-rw-r--r--data/server.desktop.in7
-rw-r--r--db_wizard/db.wiz12
-rw-r--r--dhcp_wizard/dhcp.wiz18
-rw-r--r--dhcp_wizard/scripts/Dhcpconf.pm4
-rw-r--r--dns_wizard/dns.wiz12
-rw-r--r--dns_wizard/scripts/Dnsconf.pm16
-rw-r--r--drakwizard.spec3
-rw-r--r--firewall_wizard/firewall.wiz18
-rw-r--r--firewall_wizard/scripts/FWconf.pm4
-rw-r--r--ftp_wizard/ftp.wiz6
-rw-r--r--ftp_wizard/scripts/Ftpconf.pm2
-rw-r--r--ftp_wizard/scripts/ProFtpconf.pm4
-rw-r--r--news_wizard/news.wiz14
-rw-r--r--news_wizard/scripts/Newsconf.pm6
-rw-r--r--po/.cvsignore1
-rw-r--r--po/Makefile2
-rw-r--r--postfix_wizard/postfix.wiz18
-rw-r--r--postfix_wizard/scripts/Postfixconf.pm4
-rw-r--r--proxy_wizard/proxy.wiz24
-rw-r--r--proxy_wizard/scripts/Squidconf.pm6
-rw-r--r--samba_wizard/samba.wiz16
-rwxr-xr-xsamba_wizard/scripts/Smbconf.pm6
-rw-r--r--server_wizard/scripts/Serverconf.pm2
-rw-r--r--server_wizard/server.wiz26
-rw-r--r--time_wizard/time.wiz22
-rw-r--r--web_wizard/scripts/Webconf.pm4
-rw-r--r--web_wizard/web.wiz6
46 files changed, 921 insertions, 135 deletions
diff --git a/Makefile b/Makefile
index ab10608d..b4fd267f 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ WIZ = common\
client_wizard\
db_wizard\
proxy_wizard\
+ data\
po
# installs all the wizards...
diff --git a/client_wizard/client.wiz b/client_wizard/client.wiz
index 0bb0317d..a1cceb86 100644
--- a/client_wizard/client.wiz
+++ b/client_wizard/client.wiz
@@ -3,11 +3,11 @@
<Wizard
name="general"
- libScript="__WIZ_HOME__/common/scripts/functions.sh"
+ libScript="/usr/share/wizards/common/scripts/functions.sh"
wizardTitle="Client wizard"
imagePosition="top"
- defaultImage="__WIZ_HOME__/client_wizard/images/DNS"
- perlModule="__WIZ_HOME__/client_wizard/scripts/Clientconf.pm"
+ defaultImage="/usr/share/wizards/client_wizard/images/DNS"
+ perlModule="/usr/share/wizards/client_wizard/scripts/Clientconf.pm"
>
<Variable
@@ -25,7 +25,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz.html"
name="Welcome"
- jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
+ jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -81,7 +81,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz.html"
name="CLIENT"
- jumpScript="__WIZ_HOME__/client_wizard/scripts/test_client.sh"
+ jumpScript="/usr/share/wizards/client_wizard/scripts/test_client.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -193,7 +193,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz.html"
name="error_need_net"
- subWizard="__WIZ_HOME__/server_wizard/server.wiz"
+ subWizard="/usr/share/wizards/server_wizard/server.wiz"
executionLevel="NORMAL"
nextFinish="false"
canBack="false"
diff --git a/client_wizard/scripts/Clientconf.pm b/client_wizard/scripts/Clientconf.pm
index 6917eda3..d481bbce 100644
--- a/client_wizard/scripts/Clientconf.pm
+++ b/client_wizard/scripts/Clientconf.pm
@@ -1,7 +1,7 @@
#!/usr/bin/perl
package Clientconf;
-require "__WIZ_HOME__/common/scripts/Vareqval.pm";
+require "/usr/share/wizards/common/scripts/Vareqval.pm";
use MDK::Common;
use strict;
diff --git a/common/scripts/DrakconnectConf.pm b/common/scripts/DrakconnectConf.pm
index 80ddbbfb..c85f0c35 100644
--- a/common/scripts/DrakconnectConf.pm
+++ b/common/scripts/DrakconnectConf.pm
@@ -1,7 +1,7 @@
#!/usr/bin/perl
package DrakconnectConf;
-require "__WIZ_HOME__/common/scripts/Vareqval.pm";
+require "/usr/share/wizards/common/scripts/Vareqval.pm";
use strict;
my $file = "/etc/sysconfig/network-scripts/drakconnect_conf";
diff --git a/data/.cvsignore b/data/.cvsignore
new file mode 100644
index 00000000..9528d3c9
--- /dev/null
+++ b/data/.cvsignore
@@ -0,0 +1,2 @@
+*.desktop
+*.directory \ No newline at end of file
diff --git a/data/Client.desktop.in b/data/Client.desktop.in
new file mode 100644
index 00000000..29a3cc50
--- /dev/null
+++ b/data/Client.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=DNS Client
+Icon=internet-mdk.png
+Exec=/usr/sbin/drakwizard /usr/share/wizards/client_wizard/client.wiz
+Terminal=0
+Type=Application
+Categories=System;X-Mandrake-ServerSettings \ No newline at end of file
diff --git a/data/DHCP.desktop.in b/data/DHCP.desktop.in
new file mode 100644
index 00000000..de310bde
--- /dev/null
+++ b/data/DHCP.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=DHCP
+Icon=internet-mdk.png
+Exec=/usr/sbin/drakwizard /usr/share/wizards/dhcp_wizard/dhcp.wiz
+Terminal=0
+Type=Application
+Categories=System;X-Mandrake-ServerSettings \ No newline at end of file
diff --git a/data/DNS.desktop.in b/data/DNS.desktop.in
new file mode 100644
index 00000000..c41c874b
--- /dev/null
+++ b/data/DNS.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=DNS
+Icon=internet-mdk.png
+Exec=/usr/sbin/drakwizard /usr/share/wizards/dns_wizard/dns.wiz
+Terminal=0
+Type=Application
+Categories=System;X-Mandrake-ServerSettings \ No newline at end of file
diff --git a/data/Makefile b/data/Makefile
new file mode 100644
index 00000000..a7fe102c
--- /dev/null
+++ b/data/Makefile
@@ -0,0 +1,25 @@
+wizards_dir = $(prefix)/share/wizards
+
+DIRECTORY_IN := $(wildcard *.directory.in)
+DIRECTORY = $(DIRECTORY_IN:.directory.in=.directory)
+
+DESKTOP_IN := $(wildcard *.desktop.in)
+DESKTOP = $(DESKTOP_IN:.desktop.in=.desktop)
+
+all: $(DIRECTORY) $(DESKTOP)
+
+clean:
+ rm -f $(DIRECTORY) $(DESKTOP)
+
+install: all
+ install -d $(wizards_dir)/desktop
+ install -m644 $(DESKTOP) $(DIRECTORY) $(wizards_dir)/desktop
+ install -d $(prefix)/../etc/gnome-vfs-2.0/vfolders
+ install -m644 server-settings.vfolder-info $(prefix)/../etc/gnome-vfs-2.0/vfolders
+
+
+%.desktop: %.desktop.in
+ ./intltool-merge --utf8 ../po $< $@ -d -u -c ../po/.intltool-merge-cache
+%.directory: %.directory.in
+ ./intltool-merge --utf8 ../po $< $@ -d -u -c ../po/.intltool-merge-cache
+
diff --git a/data/ServerConfig.directory.in b/data/ServerConfig.directory.in
new file mode 100644
index 00000000..a2b86b68
--- /dev/null
+++ b/data/ServerConfig.directory.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+_Name=Server Settings
+Icon=server_section.png
+Type=Directory \ No newline at end of file
diff --git a/data/Time.desktop.in b/data/Time.desktop.in
new file mode 100644
index 00000000..885f0b99
--- /dev/null
+++ b/data/Time.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=Time
+Icon=internet-mdk.png
+Exec=/usr/sbin/drakwizard /usr/share/wizards/time_wizard/time.wiz
+Terminal=0
+Type=Application
+Categories=System;X-Mandrake-ServerSettings \ No newline at end of file
diff --git a/data/Web.desktop.in b/data/Web.desktop.in
new file mode 100644
index 00000000..acc9cbcc
--- /dev/null
+++ b/data/Web.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=Web
+Icon=internet-mdk.png
+Exec=/usr/sbin/drakwizard /usr/share/wizards/web_wizard/web.wiz
+Terminal=0
+Type=Application
+Categories=System;X-Mandrake-ServerSettings \ No newline at end of file
diff --git a/data/ftp.desktop.in b/data/ftp.desktop.in
new file mode 100644
index 00000000..1845c715
--- /dev/null
+++ b/data/ftp.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=FTP
+Icon=internet-mdk.png
+Exec=/usr/sbin/drakwizard /usr/share/wizards/ftp_wizard/ftp.wiz
+Terminal=0
+Type=Application
+Categories=System;X-Mandrake-ServerSettings \ No newline at end of file
diff --git a/data/intltool-merge b/data/intltool-merge
new file mode 100755
index 00000000..06637146
--- /dev/null
+++ b/data/intltool-merge
@@ -0,0 +1,657 @@
+#!/usr/bin/perl -w
+
+#
+# The Intltool Message Merger
+#
+# Copyright (C) 2000, 2002 Free Software Foundation.
+# Copyright (C) 2000, 2001 Eazel, Inc
+#
+# Intltool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# version 2 published by the Free Software Foundation.
+#
+# Intltool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+#
+# Authors: Maciej Stachowiak <mjs@noisehavoc.org>
+# Kenneth Christiansen <kenneth@gnu.org>
+# Darin Adler <darin@bentspoon.com>
+#
+# Proper XML UTF-8'ification written by Cyrille Chepelov <chepelov@calixo.net>
+#
+
+## Release information
+my $PROGRAM = "intltool-merge";
+my $PACKAGE = "intltool";
+my $VERSION = "0.22";
+
+## Loaded modules
+use strict;
+use Getopt::Long;
+
+## Scalars used by the option stuff
+my $HELP_ARG = 0;
+my $VERSION_ARG = 0;
+my $BA_STYLE_ARG = 0;
+my $XML_STYLE_ARG = 0;
+my $KEYS_STYLE_ARG = 0;
+my $DESKTOP_STYLE_ARG = 0;
+my $SCHEMAS_STYLE_ARG = 0;
+my $QUIET_ARG = 0;
+my $PASS_THROUGH_ARG = 0;
+my $UTF8_ARG = 0;
+my $cache_file;
+
+## Handle options
+GetOptions
+(
+ "help" => \$HELP_ARG,
+ "version" => \$VERSION_ARG,
+ "quiet|q" => \$QUIET_ARG,
+ "oaf-style|o" => \$BA_STYLE_ARG, ## for compatibility
+ "ba-style|b" => \$BA_STYLE_ARG,
+ "xml-style|x" => \$XML_STYLE_ARG,
+ "keys-style|k" => \$KEYS_STYLE_ARG,
+ "desktop-style|d" => \$DESKTOP_STYLE_ARG,
+ "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
+ "pass-through|p" => \$PASS_THROUGH_ARG,
+ "utf8|u" => \$UTF8_ARG,
+ "cache|c=s" => \$cache_file
+ ) or &error;
+
+my $PO_DIR;
+my $FILE;
+my $OUTFILE;
+
+my %po_files_by_lang = ();
+my %translations = ();
+
+# Use this instead of \w for XML files to handle more possible characters.
+my $w = "[-A-Za-z0-9._:]";
+
+# XML quoted string contents
+my $q = "[^\\\"]*";
+
+## Check for options.
+
+if ($VERSION_ARG) {
+ &print_version;
+} elsif ($HELP_ARG) {
+ &print_help;
+} elsif ($BA_STYLE_ARG && @ARGV > 2) {
+ &preparation;
+ &print_message;
+ &ba_merge_translations;
+ &finalize;
+} elsif ($XML_STYLE_ARG && @ARGV > 2) {
+ &utf8_sanity_check;
+ &preparation;
+ &print_message;
+ &xml_merge_translations;
+ &finalize;
+} elsif ($KEYS_STYLE_ARG && @ARGV > 2) {
+ &utf8_sanity_check;
+ &preparation;
+ &print_message;
+ &keys_merge_translations;
+ &finalize;
+} elsif ($DESKTOP_STYLE_ARG && @ARGV > 2) {
+ &preparation;
+ &print_message;
+ &desktop_merge_translations;
+ &finalize;
+} elsif ($SCHEMAS_STYLE_ARG && @ARGV > 2) {
+ &preparation;
+ &print_message;
+ &schemas_merge_translations;
+ &finalize;
+} else {
+ &print_help;
+}
+
+exit;
+
+## Sub for printing release information
+sub print_version
+{
+ print "${PROGRAM} (${PACKAGE}) ${VERSION}\n";
+ print "Written by Maciej Stachowiak, Darin Adler and Kenneth Christiansen.\n\n";
+ print "Copyright (C) 2000-2002 Free Software Foundation, Inc.\n";
+ print "Copyright (C) 2000-2001 Eazel, Inc.\n";
+ print "This is free software; see the source for copying conditions. There is NO\n";
+ print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
+ exit;
+}
+
+## Sub for printing usage information
+sub print_help
+{
+ print "Usage: ${PROGRAM} [OPTIONS] PO_DIRECTORY FILENAME OUTPUT_FILE\n";
+ print "Generates an output file that includes translated versions of some attributes,\n";
+ print "from an untranslated source and a po directory that includes translations.\n\n";
+ print " -b, --ba-style includes translations in the bonobo-activation style\n";
+ print " -d, --desktop-style includes translations in the desktop style\n";
+ print " -k, --keys-style includes translations in the keys style\n";
+ print " -s, --schemas-style includes translations in the schemas style\n";
+ print " -x, --xml-style includes translations in the standard xml style\n";
+ print " -u, --utf8 convert all strings to UTF-8 before merging\n";
+ print " -p, --pass-through use strings as found in .po files, without\n";
+ print " conversion (STRONGLY unrecommended with -x)\n";
+ print " -q, --quiet suppress most messages\n";
+ print " --help display this help and exit\n";
+ print " --version output version information and exit\n";
+ print "\nReport bugs to bugzilla.gnome.org, module intltool, or contact us through \n";
+ print "<xml-i18n-tools-list\@gnome.org>.\n";
+ exit;
+}
+
+
+## Sub for printing error messages
+sub print_error
+{
+ print "Try `${PROGRAM} --help' for more information.\n";
+ exit;
+}
+
+
+sub print_message
+{
+ print "Merging translations into $OUTFILE.\n" unless $QUIET_ARG;
+}
+
+
+sub preparation
+{
+ $PO_DIR = $ARGV[0];
+ $FILE = $ARGV[1];
+ $OUTFILE = $ARGV[2];
+
+ &gather_po_files;
+ &get_translation_database;
+}
+
+# General-purpose code for looking up translations in .po files
+
+sub po_file2lang
+{
+ my ($tmp) = @_;
+ $tmp =~ s/^.*\/(.*)\.po$/$1/;
+ return $tmp;
+}
+
+sub gather_po_files
+{
+ for my $po_file (glob "$PO_DIR/*.po") {
+ $po_files_by_lang{po_file2lang($po_file)} = $po_file;
+ }
+}
+
+sub get_po_encoding
+{
+ my ($in_po_file) = @_;
+ my $encoding = "";
+
+ open IN_PO_FILE, $in_po_file or die;
+ while (<IN_PO_FILE>) {
+ ## example: "Content-Type: text/plain; charset=ISO-8859-1\n"
+ if (/Content-Type\:.*charset=([-a-zA-Z0-9]+)\\n/) {
+ $encoding = $1;
+ last;
+ }
+ }
+ close IN_PO_FILE;
+
+ if (!$encoding) {
+ print "Warning: no encoding found in $in_po_file. Assuming ISO-8859-1\n";
+ $encoding = "ISO-8859-1";
+ }
+ return $encoding
+}
+
+sub utf8_sanity_check
+{
+ if (!$UTF8_ARG) {
+ if (!$PASS_THROUGH_ARG) {
+ $PASS_THROUGH_ARG="1";
+ }
+ }
+}
+
+sub get_translation_database
+{
+ if ($cache_file) {
+ &get_cached_translation_database;
+ } else {
+ &create_translation_database;
+ }
+}
+
+sub get_newest_po_age
+{
+ my $newest_age;
+
+ foreach my $file (values %po_files_by_lang) {
+ my $file_age = -M $file;
+ $newest_age = $file_age if !$newest_age || $file_age < $newest_age;
+ }
+
+ return $newest_age;
+}
+
+sub create_cache
+{
+ print "Generating and caching the translation database\n" unless $QUIET_ARG;
+
+ &create_translation_database;
+
+ open CACHE, ">$cache_file" || die;
+ print CACHE join "\x01", %translations;
+ close CACHE;
+}
+
+sub load_cache
+{
+ print "Found cached translation database\n" unless $QUIET_ARG;
+
+ my $contents;
+ open CACHE, "<$cache_file" || die;
+ {
+ local $/;
+ $contents = <CACHE>;
+ }
+ close CACHE;
+ %translations = split "\x01", $contents;
+}
+
+sub get_cached_translation_database
+{
+ my $cache_file_age = -M $cache_file;
+ if (defined $cache_file_age) {
+ if ($cache_file_age <= &get_newest_po_age) {
+ &load_cache;
+ return;
+ }
+ print "Found too-old cached translation database\n" unless $QUIET_ARG;
+ }
+
+ &create_cache;
+}
+
+sub create_translation_database
+{
+ for my $lang (keys %po_files_by_lang) {
+ my $po_file = $po_files_by_lang{$lang};
+
+ if ($UTF8_ARG) {
+ my $encoding = get_po_encoding ($po_file);
+ if (lc $encoding eq "utf-8") {
+ open PO_FILE, "<$po_file";
+ } else {
+ my $iconv = $ENV{"INTLTOOL_ICONV"} || "iconv";
+ open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|";
+ }
+ } else {
+ open PO_FILE, "<$po_file";
+ }
+
+ my $nextfuzzy = 0;
+ my $inmsgid = 0;
+ my $inmsgstr = 0;
+ my $msgid = "";
+ my $msgstr = "";
+ while (<PO_FILE>) {
+ $nextfuzzy = 1 if /^#, fuzzy/;
+ if (/^msgid "((\\.|[^\\])*)"/ ) {
+ $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
+ $msgid = "";
+ $msgstr = "";
+
+ if ($nextfuzzy) {
+ $inmsgid = 0;
+ } else {
+ $msgid = unescape_po_string($1);
+ $inmsgid = 1;
+ }
+ $inmsgstr = 0;
+ $nextfuzzy = 0;
+ }
+ if (/^msgstr "((\\.|[^\\])*)"/) {
+ $msgstr = unescape_po_string($1);
+ $inmsgstr = 1;
+ $inmsgid = 0;
+ }
+ if (/^"((\\.|[^\\])*)"/) {
+ $msgid .= unescape_po_string($1) if $inmsgid;
+ $msgstr .= unescape_po_string($1) if $inmsgstr;
+ }
+ }
+ $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
+ }
+}
+
+sub finalize
+{
+}
+
+sub unescape_one_sequence
+{
+ my ($sequence) = @_;
+
+ return "\\" if $sequence eq "\\\\";
+ return "\"" if $sequence eq "\\\"";
+
+ # gettext also handles \n, \t, \b, \r, \f, \v, \a, \xxx (octal),
+ # \xXX (hex) and has a comment saying they want to handle \u and \U.
+
+ return $sequence;
+}
+
+sub unescape_po_string
+{
+ my ($string) = @_;
+
+ $string =~ s/(\\.)/unescape_one_sequence($1)/eg;
+
+ return $string;
+}
+
+sub entity_decode
+{
+ local ($_) = @_;
+
+ s/&apos;/'/g; # '
+ s/&quot;/"/g; # "
+ s/&amp;/&/g;
+
+ return $_;
+}
+
+sub entity_encode
+{
+ my ($pre_encoded) = @_;
+
+ my @list_of_chars = unpack ('C*', $pre_encoded);
+
+ if ($PASS_THROUGH_ARG) {
+ return join ('', map (&entity_encode_int_even_high_bit, @list_of_chars));
+ } else {
+ return join ('', map (&entity_encode_int_minimalist, @list_of_chars));
+ }
+}
+
+sub entity_encode_int_minimalist
+{
+ return "&quot;" if $_ == 34;
+ return "&amp;" if $_ == 38;
+ return "&apos;" if $_ == 39;
+ return chr $_;
+}
+
+sub entity_encode_int_even_high_bit
+{
+ if ($_ > 127 || $_ == 34 || $_ == 38 || $_ == 39) {
+ # the ($_ > 127) should probably be removed
+ return "&#" . $_ . ";";
+ } else {
+ return chr $_;
+ }
+}
+
+sub entity_encoded_translation
+{
+ my ($lang, $string) = @_;
+
+ my $translation = $translations{$lang, $string};
+ return $string if !$translation;
+ return entity_encode ($translation);
+}
+
+## XML (bonobo-activation specific) merge code
+
+sub ba_merge_translations
+{
+ my $source;
+
+ {
+ local $/; # slurp mode
+ open INPUT, "<$FILE" or die "can't open $FILE: $!";
+ $source = <INPUT>;
+ close INPUT;
+ }
+
+ open OUTPUT, ">$OUTFILE" or die "can't open $OUTFILE: $!";
+
+ while ($source =~ s|^(.*?)([ \t]*<\s*$w+\s+($w+\s*=\s*"$q"\s*)+/?>)([ \t]*\n)?||s) {
+ print OUTPUT $1;
+
+ my $node = $2 . "\n";
+
+ my @strings = ();
+ $_ = $node;
+ while (s/(\s)_($w+\s*=\s*"($q)")/$1$2/s) {
+ push @strings, entity_decode($3);
+ }
+ print OUTPUT;
+
+ my %langs;
+ for my $string (@strings) {
+ for my $lang (keys %po_files_by_lang) {
+ $langs{$lang} = 1 if $translations{$lang, $string};
+ }
+ }
+
+ for my $lang (sort keys %langs) {
+ $_ = $node;
+ s/(\sname\s*=\s*)"($q)"/$1"$2-$lang"/s;
+ s/(\s)_($w+\s*=\s*")($q)"/$1 . $2 . entity_encoded_translation($lang, $3) . '"'/seg;
+ print OUTPUT;
+ }
+ }
+
+ print OUTPUT $source;
+
+ close OUTPUT;
+}
+
+
+## XML (non-bonobo-activation) merge code
+
+sub xml_merge_translations
+{
+ my $source;
+
+ {
+ local $/; # slurp mode
+ open INPUT, "<$FILE" or die "can't open $FILE: $!";
+ $source = <INPUT>;
+ close INPUT;
+ }
+
+ open OUTPUT, ">$OUTFILE" or die;
+
+ # FIXME: support attribute translations
+
+ # Empty nodes never need translation, so unmark all of them.
+ # For example, <_foo/> is just replaced by <foo/>.
+ $source =~ s|<\s*_($w+)\s*/>|<$1/>|g;
+
+ # Support for <_foo>blah</_foo> style translations.
+ while ($source =~ s|^(.*?)([ \t]*)<\s*_($w+)\s*>(.*?)<\s*/_\3\s*>([ \t]*\n)?||s) {
+ print OUTPUT $1;
+
+ my $spaces = $2;
+ my $tag = $3;
+ my $string = $4;
+
+ print OUTPUT "$spaces<$tag>$string</$tag>\n";
+
+ $string =~ s/\s+/ /g;
+ $string =~ s/^ //;
+ $string =~ s/ $//;
+ $string = entity_decode($string);
+
+ for my $lang (sort keys %po_files_by_lang) {
+ my $translation = $translations{$lang, $string};
+ next if !$translation;
+ $translation = entity_encode($translation);
+ print OUTPUT "$spaces<$tag xml:lang=\"$lang\">$translation</$tag>\n";
+ }
+ }
+
+ print OUTPUT $source;
+
+ close OUTPUT;
+}
+
+sub keys_merge_translations
+{
+ open INPUT, "<${FILE}" or die;
+ open OUTPUT, ">${OUTFILE}" or die;
+
+ while (<INPUT>) {
+ if (s/^(\s*)_(\w+=(.*))/$1$2/) {
+ my $string = $3;
+
+ print OUTPUT;
+
+ my $non_translated_line = $_;
+
+ for my $lang (sort keys %po_files_by_lang) {
+ my $translation = $translations{$lang, $string};
+ next if !$translation;
+
+ $_ = $non_translated_line;
+ s/(\w+)=.*/[$lang]$1=$translation/;
+ print OUTPUT;
+ }
+ } else {
+ print OUTPUT;
+ }
+ }
+
+ close OUTPUT;
+ close INPUT;
+}
+
+sub desktop_merge_translations
+{
+ open INPUT, "<${FILE}" or die;
+ open OUTPUT, ">${OUTFILE}" or die;
+
+ while (<INPUT>) {
+ if (s/^(\s*)_(\w+=(.*))/$1$2/) {
+ my $string = $3;
+
+ print OUTPUT;
+
+ my $non_translated_line = $_;
+
+ for my $lang (sort keys %po_files_by_lang) {
+ my $translation = $translations{$lang, $string};
+ next if !$translation;
+
+ $_ = $non_translated_line;
+ s/(\w+)=.*/${1}[$lang]=$translation/;
+ print OUTPUT;
+ }
+ } else {
+ print OUTPUT;
+ }
+ }
+
+ close OUTPUT;
+ close INPUT;
+}
+
+sub schemas_merge_translations
+{
+ my $source;
+
+ {
+ local $/; # slurp mode
+ open INPUT, "<$FILE" or die "can't open $FILE: $!";
+ $source = <INPUT>;
+ close INPUT;
+ }
+
+ open OUTPUT, ">$OUTFILE" or die;
+
+ # FIXME: support attribute translations
+
+ # Empty nodes never need translation, so unmark all of them.
+ # For example, <_foo/> is just replaced by <foo/>.
+ $source =~ s|<\s*_($w+)\s*/>|<$1/>|g;
+
+ # Support for <_foo>blah</_foo> style translations.
+
+ my $regex_start = "^(.*?)([ \t]*)<locale name=\"C\">";
+ my $regex_short = "([ \t\n]*)<short>(.*?)</short>";
+ my $regex_long = "([ \t\n]*)<long>(.*?)</long>";
+ my $regex_end = "([ \t\n]*)</locale>";
+
+ while ($source =~ s|$regex_start$regex_short$regex_long$regex_end||s) {
+ print OUTPUT $1;
+
+ my $locale_start_spaces = $2;
+ my $locale_end_spaces = $7;
+ my $short_spaces = $3;
+ my $short_string = $4;
+ my $long_spaces = $5;
+ my $long_string = $6;
+
+ # English first
+
+ print OUTPUT "$locale_start_spaces<locale name=\"C\">";
+ print OUTPUT "$short_spaces<short>$short_string</short>";
+ print OUTPUT "$long_spaces<long>$long_string</long>";
+ print OUTPUT "$locale_end_spaces</locale>";
+
+ $short_string =~ s/\s+/ /g;
+ $short_string =~ s/^ //;
+ $short_string =~ s/ $//;
+ $short_string = entity_decode($short_string);
+
+ $long_string =~ s/\s+/ /g;
+ $long_string =~ s/^ //;
+ $long_string =~ s/ $//;
+ $long_string = entity_decode($long_string);
+
+ for my $lang (sort keys %po_files_by_lang) {
+ my $short_translation = $translations{$lang, $short_string};
+ my $long_translation = $translations{$lang, $long_string};
+
+ next if (!$short_translation && !$long_translation);
+
+ print OUTPUT "\n$locale_start_spaces<locale name=\"$lang\">";
+
+ if ($short_translation)
+ {
+ $short_translation = entity_encode($short_translation);
+ print OUTPUT "$short_spaces<short>$short_translation</short>";
+ }
+
+ if ($long_translation)
+ {
+ $long_translation = entity_encode($long_translation);
+ print OUTPUT "$long_spaces<long>$long_translation</long>";
+ }
+
+ print OUTPUT "$locale_end_spaces</locale>";
+ }
+ }
+
+ print OUTPUT $source;
+
+ close OUTPUT;
+}
diff --git a/data/news.desktop.in b/data/news.desktop.in
new file mode 100644
index 00000000..6234da06
--- /dev/null
+++ b/data/news.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=News
+Icon=internet-mdk.png
+Exec=/usr/sbin/drakwizard /usr/share/wizards/news_wizard/news.wiz
+Terminal=0
+Type=Application
+Categories=System;X-Mandrake-ServerSettings \ No newline at end of file
diff --git a/data/postfix.desktop.in b/data/postfix.desktop.in
new file mode 100644
index 00000000..14b0fc78
--- /dev/null
+++ b/data/postfix.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=Postfix
+Icon=internet-mdk.png
+Exec=/usr/sbin/drakwizard /usr/share/wizards/postfix_wizard/postfix.wiz
+Terminal=0
+Type=Application
+Categories=System;X-Mandrake-ServerSettings \ No newline at end of file
diff --git a/data/proxy.desktop.in b/data/proxy.desktop.in
new file mode 100644
index 00000000..2067e241
--- /dev/null
+++ b/data/proxy.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=Proxy
+Icon=internet-mdk.png
+Exec=/usr/sbin/drakwizard /usr/share/wizards/proxy_wizard/proxy.wiz
+Terminal=0
+Type=Application
+Categories=System;X-Mandrake-ServerSettings \ No newline at end of file
diff --git a/data/samba.desktop.in b/data/samba.desktop.in
new file mode 100644
index 00000000..de060875
--- /dev/null
+++ b/data/samba.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=Samba
+Icon=internet-mdk.png
+Exec=/usr/sbin/drakwizard /usr/share/wizards/samba_wizard/samba.wiz
+Terminal=0
+Type=Application
+Categories=System;X-Mandrake-ServerSettings \ No newline at end of file
diff --git a/data/server-settings.vfolder-info b/data/server-settings.vfolder-info
new file mode 100644
index 00000000..8c2fee33
--- /dev/null
+++ b/data/server-settings.vfolder-info
@@ -0,0 +1,18 @@
+<VFolderInfo>
+ <ItemDir>/usr/share/wizards/desktop</ItemDir>
+
+ <DesktopDir>/usr/share/wizards/desktop</DesktopDir>
+
+ <!-- Settings -->
+ <Folder>
+ <Name>Server Settings</Name>
+ <Desktop>ServerConfig.directory</Desktop>
+ <Query>
+ <And>
+ <Keyword>System</Keyword>
+ <Keyword>X-Mandrake-ServerSettings</Keyword>
+ </And>
+ </Query>
+ </Folder>
+
+</VFolderInfo>
diff --git a/data/server.desktop.in b/data/server.desktop.in
new file mode 100644
index 00000000..7d081977
--- /dev/null
+++ b/data/server.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=Server
+Icon=internet-mdk.png
+Exec=/usr/sbin/drakwizard /usr/share/wizards/server_wizard/server.wiz
+Terminal=0
+Type=Application
+Categories=System;X-Mandrake-ServerSettings \ No newline at end of file
diff --git a/db_wizard/db.wiz b/db_wizard/db.wiz
index 8fff8105..c529cd42 100644
--- a/db_wizard/db.wiz
+++ b/db_wizard/db.wiz
@@ -3,10 +3,10 @@
<Wizard
name="general"
- libScript="__WIZ_HOME__/common/scripts/functions.sh"
+ libScript="/usr/share/wizards/common/scripts/functions.sh"
wizardTitle="MySQL Database wizard"
imagePosition="top"
- defaultImage="__WIZ_HOME__/db_wizard/images/SQL"
+ defaultImage="/usr/share/wizards/db_wizard/images/SQL"
rpm="MySQL"
>
@@ -34,7 +34,7 @@
<Page
name="welcome"
- jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
+ jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -92,7 +92,7 @@
<Page
name="error_need_net"
- subWizard="__WIZ_HOME__/server_wizard/server.wiz"
+ subWizard="/usr/share/wizards/server_wizard/server.wiz"
executionLevel="NORMAL"
nextFinish="false"
canBack="false"
@@ -169,7 +169,7 @@
<Page
name="confirmation"
- jumpScript="__WIZ_HOME__/db_wizard/scripts/root_passwd.sh"
+ jumpScript="/usr/share/wizards/db_wizard/scripts/root_passwd.sh"
jumpPage="adduser"
nextButtonText="Confirm"
executionLevel="NORMAL"
@@ -209,7 +209,7 @@ needed to configure your MySQL Database Server"
<Page
name="adduser"
nextButtonText="Add"
- jumpScript="__WIZ_HOME__/db_wizard/scripts/add_user.sh"
+ jumpScript="/usr/share/wizards/db_wizard/scripts/add_user.sh"
jumpPage="congratulations"
executionLevel="NORMAL"
nextFinish="false"
diff --git a/dhcp_wizard/dhcp.wiz b/dhcp_wizard/dhcp.wiz
index f253fc86..a5f3d939 100644
--- a/dhcp_wizard/dhcp.wiz
+++ b/dhcp_wizard/dhcp.wiz
@@ -3,11 +3,11 @@
<Wizard
name="general"
- libScript="__WIZ_HOME__/common/scripts/functions.sh"
+ libScript="/usr/share/wizards/common/scripts/functions.sh"
wizardTitle="DHCP Wizard"
imagePosition="top"
- defaultImage="__WIZ_HOME__/dhcp_wizard/images/DHCP"
- perlModule="__WIZ_HOME__/dhcp_wizard/scripts/Dhcpconf.pm"
+ defaultImage="/usr/share/wizards/dhcp_wizard/images/DHCP"
+ perlModule="/usr/share/wizards/dhcp_wizard/scripts/Dhcpconf.pm"
rpm="dhcp-server"
>
@@ -30,7 +30,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dhcp.html"
name="welcome"
- jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
+ jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -76,7 +76,7 @@
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dhcp.html"
name="ask_dhcp_ip_range"
comment="Ask the dhcp ip range"
- jumpScript="__WIZ_HOME__/dhcp_wizard/check_range.sh"
+ jumpScript="/usr/share/wizards/dhcp_wizard/check_range.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -110,7 +110,7 @@
<Freetext
name="dhcpIpLow"
variableName="dhcp_range_low"
- fillScript="__WIZ_HOME__/dhcp_wizard/compute_range1.sh"
+ fillScript="/usr/share/wizards/dhcp_wizard/compute_range1.sh"
helpText="Lowest IP Address:"
editable="true"
>
@@ -119,7 +119,7 @@
<Freetext
name="dhcpIpHigh"
variableName="dhcp_range_high"
- fillScript="__WIZ_HOME__/dhcp_wizard/compute_range2.sh"
+ fillScript="/usr/share/wizards/dhcp_wizard/compute_range2.sh"
helpText="Highest IP Address:"
editable="true"
>
@@ -152,7 +152,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dhcp.html"
name="doit"
- jumpScript="__WIZ_HOME__/dhcp_wizard/do_it_dhcp.sh"
+ jumpScript="/usr/share/wizards/dhcp_wizard/do_it_dhcp.sh"
nextButtonText="Configure"
executionLevel="NORMAL"
nextFinish="false"
@@ -249,7 +249,7 @@ needed to configure your DHCP service:"
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-dhcp.html"
name="error_need_net"
- subWizard="__WIZ_HOME__/server_wizard/server.wiz"
+ subWizard="/usr/share/wizards/server_wizard/server.wiz"
executionLevel="NORMAL"
nextFinish="false"
canBack="false"
diff --git a/dhcp_wizard/scripts/Dhcpconf.pm b/dhcp_wizard/scripts/Dhcpconf.pm
index 3a3a3e8d..4b508565 100644
--- a/dhcp_wizard/scripts/Dhcpconf.pm
+++ b/dhcp_wizard/scripts/Dhcpconf.pm
@@ -1,7 +1,7 @@
#!/usr/bin/perl
package Dhcpconf;
-require "__WIZ_HOME__/common/scripts/Vareqval.pm";
+require "/usr/share/wizards/common/scripts/Vareqval.pm";
use MDK::Common;
use strict;
@@ -66,7 +66,7 @@ sub do_it {
die "can't make a temp file: $!";
open(NEW, "> $tmp") or
die "can't open $tmp: $!";
- open(OLD, "< __WIZ_HOME__/dhcp_wizard/scripts/dhcpd.conf.default") or
+ open(OLD, "< /usr/share/wizards/dhcp_wizard/scripts/dhcpd.conf.default") or
die "can't open default: $!";
while (<OLD>) {
s|__hname__|$wiz_host_name|g;
diff --git a/dns_wizard/dns.wiz b/dns_wizard/dns.wiz
index f7b9f68c..2c986df0 100644
--- a/dns_wizard/dns.wiz
+++ b/dns_wizard/dns.wiz
@@ -3,11 +3,11 @@
<Wizard
name="general"
- libScript="__WIZ_HOME__/common/scripts/functions.sh"
+ libScript="/usr/share/wizards/common/scripts/functions.sh"
wizardTitle="DNS Wizard"
imagePosition="top"
- defaultImage="__WIZ_HOME__/dns_wizard/images/DNS"
- perlModule="__WIZ_HOME__/dns_wizard/scripts/Dnsconf.pm"
+ defaultImage="/usr/share/wizards/dns_wizard/images/DNS"
+ perlModule="/usr/share/wizards/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="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
+ jumpScript="/usr/share/wizards/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="__WIZ_HOME__/dns_wizard/scripts/check_ext_dns.sh"
+ jumpScript="/usr/share/wizards/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="__WIZ_HOME__/server_wizard/server.wiz"
+ subWizard="/usr/share/wizards/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 f5a00abb..59ffee9b 100644
--- a/dns_wizard/scripts/Dnsconf.pm
+++ b/dns_wizard/scripts/Dnsconf.pm
@@ -1,8 +1,8 @@
#!/usr/bin/perl
package Dnsconf;
-require "__WIZ_HOME__/common/scripts/Vareqval.pm";
-require "__WIZ_HOME__/common/scripts/DrakconnectConf.pm";
+require "/usr/share/wizards/common/scripts/Vareqval.pm";
+require "/usr/share/wizards/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("__WIZ_HOME__/dns_wizard/scripts/host.conf.default", $file);
+ MDK::Common::cp_af("/usr/share/wizards/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_("__WIZ_HOME__/dns_wizard/scripts/named.conf.default"));
+ } cat_("/usr/share/wizards/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("__WIZ_HOME__/dns_wizard/scripts/root.hints.default", $file);
+ MDK::Common::cp_af("/usr/share/wizards/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_("__WIZ_HOME__/dns_wizard/scripts/127.0.0.rev.default"));
+ } cat_("/usr/share/wizards/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_("__WIZ_HOME__/dns_wizard/scripts/ipnet.rev.default"));
+ } cat_("/usr/share/wizards/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_("__WIZ_HOME__/dns_wizard/scripts/domain.db.default"));
+ } cat_("/usr/share/wizards/dns_wizard/scripts/domain.db.default"));
up_serial($file);
#resolv.conf
diff --git a/drakwizard.spec b/drakwizard.spec
index 7462b45a..1b3b21c4 100644
--- a/drakwizard.spec
+++ b/drakwizard.spec
@@ -43,6 +43,7 @@ rm -rf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME
%files -f %{name}.lang
%defattr(-,root,root)
%doc Wizard.dtd
+%config(noreplace) %_sysconfdir/gnome-vfs-2.0/vfolders/*
%_sbindir/drakwizard
%_datadir/wizards*
@@ -53,7 +54,7 @@ rm -rf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME
* Tue Aug 13 2002 Arnaud Desmons <adesmons@ke.mandrakesoft.com> 0.2-3mdk
- use of drakconnect db for web, ftp and samba wizards.
-* Mon Aug 12 2002 <logarno@host.domain.net> 0.2-2mdk
+* Mon Aug 12 2002 Arnaud Desmons <adesmons@ke.mandrakesoft.com> 0.2-2mdk
- proftpd support
* Fri Aug 9 2002 Arnaud Desmons <adesmons@ke.mandrakesoft.com> 0.2-1mdk
diff --git a/firewall_wizard/firewall.wiz b/firewall_wizard/firewall.wiz
index ba689abd..bd9b6084 100644
--- a/firewall_wizard/firewall.wiz
+++ b/firewall_wizard/firewall.wiz
@@ -3,11 +3,11 @@
<Wizard
name="general"
- libScript="__WIZ_HOME__/common/scripts/functions.sh"
+ libScript="/usr/share/wizards/common/scripts/functions.sh"
wizardTitle="Firewall wizard"
imagePosition="top"
- defaultImage="__WIZ_HOME__/firewall_wizard/images/firewall"
- perlModule="__WIZ_HOME__/firewall_wizard/scripts/FWconf.pm"
+ defaultImage="/usr/share/wizards/firewall_wizard/images/firewall"
+ perlModule="/usr/share/wizards/firewall_wizard/scripts/FWconf.pm"
>
<Variable
@@ -29,7 +29,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-firewall.html"
name="Welcome"
- jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
+ jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -149,7 +149,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-firewall.html"
name="choose_net_device"
- jumpScript="__WIZ_HOME__/firewall_wizard/check_ext_device.sh"
+ jumpScript="/usr/share/wizards/firewall_wizard/check_ext_device.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -183,8 +183,8 @@
<Chooser
name="deviceChooser"
variableName="firewallDevice"
- defaultOptionScript="__WIZ_HOME__/firewall_wizard/compute_ext_device.sh"
- fillScript="__WIZ_HOME__/firewall_wizard/liste_ext_device.sh"
+ defaultOptionScript="/usr/share/wizards/firewall_wizard/compute_ext_device.sh"
+ fillScript="/usr/share/wizards/firewall_wizard/liste_ext_device.sh"
helpText="Device"
helpFontName="Default"
helpFontStyle="plain"
@@ -249,7 +249,7 @@ needed to configure your firewall:"
<Freetext
name="freetext"
- fillScript="__WIZ_HOME__/firewall_wizard/compute_level_name.sh"
+ fillScript="/usr/share/wizards/firewall_wizard/compute_level_name.sh"
helpText="Protection Level:"
editable="false"
>
@@ -329,7 +329,7 @@ needed to configure your firewall:"
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-firewall.html"
name="error_need_net"
- subWizard="__WIZ_HOME__/server_wizard/server.wiz"
+ subWizard="/usr/share/wizards/server_wizard/server.wiz"
executionLevel="NORMAL"
nextFinish="false"
canBack="false"
diff --git a/firewall_wizard/scripts/FWconf.pm b/firewall_wizard/scripts/FWconf.pm
index 87ecc226..31c0f23c 100644
--- a/firewall_wizard/scripts/FWconf.pm
+++ b/firewall_wizard/scripts/FWconf.pm
@@ -1,7 +1,7 @@
#!/usr/bin/perl
package FWconf;
-require "__WIZ_HOME__/common/scripts/Vareqval.pm";
+require "/usr/share/wizards/common/scripts/Vareqval.pm";
use MDK::Common;
#use strict;
@@ -34,7 +34,7 @@ sub do_it {
store_fwall();
- my %conf = ("__WIZ_HOME__/firewall_wizard/scripts/bastille-firewall.cfg.default" =>
+ my %conf = ("/usr/share/wizards/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 113c2518..1903b3ec 100644
--- a/ftp_wizard/ftp.wiz
+++ b/ftp_wizard/ftp.wiz
@@ -3,11 +3,11 @@
<Wizard
name="general"
- libScript="__WIZ_HOME__/common/scripts/functions.sh"
+ libScript="/usr/share/wizards/common/scripts/functions.sh"
wizardTitle="FTP wizard"
imagePosition="top"
- defaultImage="__WIZ_HOME__/ftp_wizard/images/FTP"
- perlModule="__WIZ_HOME__/ftp_wizard/scripts/ProFtpconf.pm"
+ defaultImage="/usr/share/wizards/ftp_wizard/images/FTP"
+ perlModule="/usr/share/wizards/ftp_wizard/scripts/ProFtpconf.pm"
rpm="proftpd"
>
diff --git a/ftp_wizard/scripts/Ftpconf.pm b/ftp_wizard/scripts/Ftpconf.pm
index a2c57f04..fdd05119 100644
--- a/ftp_wizard/scripts/Ftpconf.pm
+++ b/ftp_wizard/scripts/Ftpconf.pm
@@ -1,7 +1,7 @@
#!/usr/bin/perl
package Ftpconf;
-require "__WIZ_HOME__/common/scripts/Vareqval.pm";
+require "/usr/share/wizards/common/scripts/Vareqval.pm";
use MDK::Common;
use strict;
diff --git a/ftp_wizard/scripts/ProFtpconf.pm b/ftp_wizard/scripts/ProFtpconf.pm
index ec596a88..8954d356 100644
--- a/ftp_wizard/scripts/ProFtpconf.pm
+++ b/ftp_wizard/scripts/ProFtpconf.pm
@@ -1,10 +1,10 @@
#!/usr/bin/perl
package ProFtpconf;
-require "__WIZ_HOME__/common/scripts/DrakconnectConf.pm";
+require "/usr/share/wizards/common/scripts/DrakconnectConf.pm";
use MDK::Common;
use strict;
-require "__WIZ_HOME__/common/scripts/Vareqval.pm";
+require "/usr/share/wizards/common/scripts/Vareqval.pm";
sub true {
my ($val) = @_;
diff --git a/news_wizard/news.wiz b/news_wizard/news.wiz
index 497b0ce4..478c7c2e 100644
--- a/news_wizard/news.wiz
+++ b/news_wizard/news.wiz
@@ -3,11 +3,11 @@
<Wizard
name="general"
- libScript="__WIZ_HOME__/common/scripts/functions.sh"
+ libScript="/usr/share/wizards/common/scripts/functions.sh"
wizardTitle="News Wizard"
imagePosition="top"
- defaultImage="__WIZ_HOME__/news_wizard/images/news"
- perlModule="__WIZ_HOME__/news_wizard/scripts/Newsconf.pm"
+ defaultImage="/usr/share/wizards/news_wizard/images/news"
+ perlModule="/usr/share/wizards/news_wizard/scripts/Newsconf.pm"
>
<Variable
@@ -31,7 +31,7 @@
<Page
name="Welcome"
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-news.html"
- jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
+ jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -71,7 +71,7 @@
<Page
name="ask_news_server"
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-news.html"
- jumpScript="__WIZ_HOME__/news_wizard/scripts/check_news_server.sh"
+ jumpScript="/usr/share/wizards/news_wizard/scripts/check_news_server.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -139,7 +139,7 @@
<Page
name="ask_news_freq"
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-news.html"
- jumpScript="__WIZ_HOME__/news_wizard/scripts/check_valid_hours.sh"
+ jumpScript="/usr/share/wizards/news_wizard/scripts/check_valid_hours.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -319,7 +319,7 @@ needed to configure your Internet News Service:"
<Page
name="error_need_net"
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-news.html"
- subWizard="__WIZ_HOME__/server_wizard/server.wiz"
+ subWizard="/usr/share/wizards/server_wizard/server.wiz"
executionLevel="NORMAL"
nextFinish="false"
canBack="false"
diff --git a/news_wizard/scripts/Newsconf.pm b/news_wizard/scripts/Newsconf.pm
index a0968891..158939c0 100644
--- a/news_wizard/scripts/Newsconf.pm
+++ b/news_wizard/scripts/Newsconf.pm
@@ -1,7 +1,7 @@
#!/usr/bin/perl
package Newsconf;
-require "__WIZ_HOME__/common/scripts/Vareqval.pm";
+require "/usr/share/wizards/common/scripts/Vareqval.pm";
use MDK::Common;
use strict;
@@ -39,7 +39,7 @@ sub do_it {
if (! -f $file) { die "$file not found: $!"};
my $tmp = `mktemp /tmp/Newsconf.XXXXXX`
or die "can't make a temp file: $!";
- open(OLD, "< __WIZ_HOME__/news_wizard/scripts/config.default")
+ open(OLD, "< /usr/share/wizards/news_wizard/scripts/config.default")
or die "can't open default: $!";
open(NEW, "> $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, "< __WIZ_HOME__/news_wizard/scripts/news.cron")
+ open(OLD, "< /usr/share/wizards/news_wizard/scripts/news.cron")
or die "can't open default: $!";
open(NEW, "> $tmp")
or die "can't open $tmp: $!";
diff --git a/po/.cvsignore b/po/.cvsignore
new file mode 100644
index 00000000..b93e3eec
--- /dev/null
+++ b/po/.cvsignore
@@ -0,0 +1 @@
+.intltool-merge-cache \ No newline at end of file
diff --git a/po/Makefile b/po/Makefile
index 5e1e1842..a51162e2 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,5 +1,5 @@
# Installation directories
-localedir = ${prefix}/usr/share/locale
+localedir = ${prefix}/share/locale
LANGS = $(shell ls *.po | xargs -i basename {} .po )
PGOAL = drakwizard
diff --git a/postfix_wizard/postfix.wiz b/postfix_wizard/postfix.wiz
index c0930fa1..66715a05 100644
--- a/postfix_wizard/postfix.wiz
+++ b/postfix_wizard/postfix.wiz
@@ -3,11 +3,11 @@
<Wizard
name="general"
- libScript="__WIZ_HOME__/common/scripts/functions.sh"
+ libScript="/usr/share/wizards/common/scripts/functions.sh"
wizardTitle="Postfix wizard"
imagePosition="top"
- defaultImage="__WIZ_HOME__/postfix_wizard/images/courrier"
- perlModule="__WIZ_HOME__/postfix_wizard/scripts/Postfixconf.pm"
+ defaultImage="/usr/share/wizards/postfix_wizard/images/courrier"
+ perlModule="/usr/share/wizards/postfix_wizard/scripts/Postfixconf.pm"
rpm="postfix"
>
@@ -26,7 +26,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-postfix.html"
name="welcome"
- jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
+ jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -106,7 +106,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-postfix.html"
name="Form_of_address"
- jumpScript="__WIZ_HOME__/postfix_wizard/scripts/check_masquerade.sh"
+ jumpScript="/usr/share/wizards/postfix_wizard/scripts/check_masquerade.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -172,7 +172,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-postfix.html"
name="ISP"
- jumpScript="__WIZ_HOME__/postfix_wizard/scripts/check_relay.sh"
+ jumpScript="/usr/share/wizards/postfix_wizard/scripts/check_relay.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -282,7 +282,7 @@ needed to configure your Internet Mail Service:"
<Freetext
name="freetext1"
- fillScript="(export wiz_ext_mail_relay=`__WIZ_HOME__/postfix_wizard/scripts/compute_mail_relay.sh`; echo $wiz_ext_mail_relay)"
+ fillScript="(export wiz_ext_mail_relay=`/usr/share/wizards/postfix_wizard/scripts/compute_mail_relay.sh`; echo $wiz_ext_mail_relay)"
helpText="Internet Mail Gateway"
editable="false"
>
@@ -290,7 +290,7 @@ needed to configure your Internet Mail Service:"
<Freetext
name="freetext2"
- fillScript="(export wiz_mail_masquerade=`__WIZ_HOME__/postfix_wizard/scripts/compute_masquerade.sh`; echo $wiz_mail_masquerade)"
+ fillScript="(export wiz_mail_masquerade=`/usr/share/wizards/postfix_wizard/scripts/compute_masquerade.sh`; echo $wiz_mail_masquerade)"
helpText="Form of the Address"
editable="false"
>
@@ -327,7 +327,7 @@ needed to configure your Internet Mail Service:"
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-postfix.html"
name="error_need_net"
- subWizard="__WIZ_HOME__/server_wizard/server.wiz"
+ subWizard="/usr/share/wizards/server_wizard/server.wiz"
executionLevel="NORMAL"
nextFinish="false"
canBack="false"
diff --git a/postfix_wizard/scripts/Postfixconf.pm b/postfix_wizard/scripts/Postfixconf.pm
index 52cc13f2..463cc85e 100644
--- a/postfix_wizard/scripts/Postfixconf.pm
+++ b/postfix_wizard/scripts/Postfixconf.pm
@@ -1,8 +1,8 @@
#!/usr/bin/perl
package Postfixconf;
-require "__WIZ_HOME__/common/scripts/Vareqval.pm";
-require "__WIZ_HOME__/common/scripts/DrakconnectConf.pm";
+require "/usr/share/wizards/common/scripts/Vareqval.pm";
+require "/usr/share/wizards/common/scripts/DrakconnectConf.pm";
use MDK::Common;
use strict;
diff --git a/proxy_wizard/proxy.wiz b/proxy_wizard/proxy.wiz
index cd264303..4532209f 100644
--- a/proxy_wizard/proxy.wiz
+++ b/proxy_wizard/proxy.wiz
@@ -3,11 +3,11 @@
<Wizard
name="general"
- libScript="__WIZ_HOME__/common/scripts/functions.sh"
+ libScript="/usr/share/wizards/common/scripts/functions.sh"
wizardTitle="Squid wizard"
imagePosition="top"
- defaultImage="__WIZ_HOME__/proxy_wizard/images/proxy"
- perlModule="__WIZ_HOME__/proxy_wizard/scripts/Squidconf.pm"
+ defaultImage="/usr/share/wizards/proxy_wizard/images/proxy"
+ perlModule="/usr/share/wizards/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="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
+ jumpScript="/usr/share/wizards/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="__WIZ_HOME__/proxy_wizard/scripts/testport.sh"
+ jumpScript="/usr/share/wizards/proxy_wizard/scripts/testport.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -309,7 +309,7 @@
<Info
comment="free space on disk"
- fillScript="__WIZ_HOME__/proxy_wizard/scripts/dfh.sh"
+ fillScript="/usr/share/wizards/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="__WIZ_HOME__/proxy_wizard/scripts/echolevel.sh $wiz_squid_level"
+ jumpScript="/usr/share/wizards/proxy_wizard/scripts/echolevel.sh $wiz_squid_level"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -412,7 +412,7 @@
<Info
- fillScript="__WIZ_HOME__/proxy_wizard/scripts/printservices.sh"
+ fillScript="/usr/share/wizards/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="__WIZ_HOME__/proxy_wizard/scripts/echolevel.sh $wiz_squid_menupeer"
+ jumpScript="/usr/share/wizards/proxy_wizard/scripts/echolevel.sh $wiz_squid_menupeer"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -624,7 +624,7 @@
<Freetext
name="s_level"
- fillScript="__WIZ_HOME__/proxy_wizard/scripts/showlevel.sh $wiz_squid_level"
+ fillScript="/usr/share/wizards/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="__WIZ_HOME__/proxy_wizard/scripts/showlevel.sh $wiz_squid_level"
+ fillScript="/usr/share/wizards/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="__WIZ_HOME__/server_wizard/server.wiz"
+ subWizard="/usr/share/wizards/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 fa99558d..e7788fec 100644
--- a/proxy_wizard/scripts/Squidconf.pm
+++ b/proxy_wizard/scripts/Squidconf.pm
@@ -1,15 +1,15 @@
#!/usr/bin/perl
package Squidconf;
-require "__WIZ_HOME__/common/scripts/Vareqval.pm";
-require "__WIZ_HOME__/common/scripts/Varspaceval.pm";
+require "/usr/share/wizards/common/scripts/Vareqval.pm";
+require "/usr/share/wizards/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("__WIZ_HOME__/proxy_wizard/scripts/squid.conf.default", $file);
+ MDK::Common::cp_af("/usr/share/wizards/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|;
diff --git a/samba_wizard/samba.wiz b/samba_wizard/samba.wiz
index f490b5dc..8eef7438 100644
--- a/samba_wizard/samba.wiz
+++ b/samba_wizard/samba.wiz
@@ -3,11 +3,11 @@
<Wizard
name="general"
- libScript="__WIZ_HOME__/common/scripts/functions.sh"
+ libScript="/usr/share/wizards/common/scripts/functions.sh"
wizardTitle="Samba wizard"
imagePosition="top"
- defaultImage="__WIZ_HOME__/samba_wizard/images/samba"
- perlModule="__WIZ_HOME__/samba_wizard/scripts/Smbconf.pm"
+ defaultImage="/usr/share/wizards/samba_wizard/images/samba"
+ perlModule="/usr/share/wizards/samba_wizard/scripts/Smbconf.pm"
rpm="samba-server"
>
@@ -42,7 +42,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
name="Welcome"
- jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
+ jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -87,7 +87,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
name="ask_services"
- jumpScript="__WIZ_HOME__/samba_wizard/scripts/check_services.sh"
+ jumpScript="/usr/share/wizards/samba_wizard/scripts/check_services.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -163,7 +163,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
name="ask_workgroup"
- jumpScript="__WIZ_HOME__/samba_wizard/scripts/check_workgroup.sh"
+ jumpScript="/usr/share/wizards/samba_wizard/scripts/check_workgroup.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -223,7 +223,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
name="ask_banner"
- jumpScript="__WIZ_HOME__/samba_wizard/scripts/check_banner.sh"
+ jumpScript="/usr/share/wizards/samba_wizard/scripts/check_banner.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -413,7 +413,7 @@ needed to configure Samba."
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
name="error_need_net"
- subWizard="__WIZ_HOME__/server_wizard/server.wiz"
+ subWizard="/usr/share/wizards/server_wizard/server.wiz"
executionLevel="NORMAL"
nextFinish="false"
canBack="false"
diff --git a/samba_wizard/scripts/Smbconf.pm b/samba_wizard/scripts/Smbconf.pm
index 577c1870..5385d429 100755
--- a/samba_wizard/scripts/Smbconf.pm
+++ b/samba_wizard/scripts/Smbconf.pm
@@ -1,8 +1,8 @@
#! /usr/bin/perl -w
package Smbconf;
-require "__WIZ_HOME__/common/scripts/Vareqval.pm";
-require "__WIZ_HOME__/common/scripts/DrakconnectConf.pm";
+require "/usr/share/wizards/common/scripts/Vareqval.pm";
+require "/usr/share/wizards/common/scripts/DrakconnectConf.pm";
use strict;
@@ -98,7 +98,7 @@ sub printer_sharing {
sub do_it {
- read_conf("__WIZ_HOME__/samba_wizard/scripts/smb.conf.default");
+ read_conf("/usr/share/wizards/samba_wizard/scripts/smb.conf.default");
chg_var("global", "workgroup", $ENV{wiz_workgroup});
chg_var("global", "server string", $ENV{wiz_banner});
my $ip = $o->get_from_known_dev("IP");
diff --git a/server_wizard/scripts/Serverconf.pm b/server_wizard/scripts/Serverconf.pm
index 4f70e74a..2af5647d 100644
--- a/server_wizard/scripts/Serverconf.pm
+++ b/server_wizard/scripts/Serverconf.pm
@@ -1,7 +1,7 @@
#!/usr/bin/perl
package Serverconf;
-require "__WIZ_HOME__/common/scripts/Vareqval.pm";
+require "/usr/share/wizards/common/scripts/Vareqval.pm";
use MDK::Common;
use strict;
diff --git a/server_wizard/server.wiz b/server_wizard/server.wiz
index 14fab983..47e7319c 100644
--- a/server_wizard/server.wiz
+++ b/server_wizard/server.wiz
@@ -3,11 +3,11 @@
<Wizard
name="general"
- libScript="__WIZ_HOME__/common/scripts/functions.sh"
+ libScript="/usr/share/wizards/common/scripts/functions.sh"
wizardTitle="Server Wizard"
imagePosition="top"
- defaultImage="__WIZ_HOME__/server_wizard/images/intranet"
- perlModule="__WIZ_HOME__/server_wizard/scripts/Serverconf.pm"
+ defaultImage="/usr/share/wizards/server_wizard/images/intranet"
+ perlModule="/usr/share/wizards/server_wizard/scripts/Serverconf.pm"
>
<Variable
@@ -72,7 +72,7 @@
<Page
name="Welcome"
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
- jumpScript="__WIZ_HOME__/common/scripts/check.sh root"
+ jumpScript="/usr/share/wizards/common/scripts/check.sh root"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -135,7 +135,7 @@
<Page
name="Note"
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
- jumpScript="__WIZ_HOME__/server_wizard/scripts/check_config.sh"
+ jumpScript="/usr/share/wizards/server_wizard/scripts/check_config.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -186,7 +186,7 @@
<Page
name="ask_hostname"
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
- jumpScript="__WIZ_HOME__/server_wizard/scripts/check_domain.sh"
+ jumpScript="/usr/share/wizards/server_wizard/scripts/check_domain.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -254,7 +254,7 @@
<Page
name="choose_net_device"
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
- jumpScript="__WIZ_HOME__/server_wizard/scripts/set_ip.sh"
+ jumpScript="/usr/share/wizards/server_wizard/scripts/set_ip.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -276,7 +276,7 @@
<Chooser
name="deviceChooser"
variableName="net_device"
- fillScript="__WIZ_HOME__/server_wizard/scripts/liste_device.sh"
+ fillScript="/usr/share/wizards/server_wizard/scripts/liste_device.sh"
helpText="Device:"
helpFontName="Default"
helpFontStyle="plain"
@@ -317,7 +317,7 @@
<Freetext
name="domainnameField"
variableName="domainname"
- fillScript="__WIZ_HOME__/server_wizard/scripts/compute_domain.sh"
+ fillScript="/usr/share/wizards/server_wizard/scripts/compute_domain.sh"
helpText="Computed domain Name"
editable="false"
>
@@ -345,7 +345,7 @@
<Page
name="ask_network_address"
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
- jumpScript="__WIZ_HOME__/server_wizard/scripts/check_network.sh"
+ jumpScript="/usr/share/wizards/server_wizard/scripts/check_network.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -379,7 +379,7 @@
<Freetext
name="freetext2"
variableName="network_address"
- fillScript="__WIZ_HOME__/server_wizard/scripts/compute_ipnet.sh"
+ fillScript="/usr/share/wizards/server_wizard/scripts/compute_ipnet.sh"
helpText="IP net address:"
editable="true"
>
@@ -426,7 +426,7 @@
<Freetext
name="freetext3"
variableName="server_address"
- fillScript="__WIZ_HOME__/server_wizard/scripts/compute_server_ip.sh"
+ fillScript="/usr/share/wizards/server_wizard/scripts/compute_server_ip.sh"
editable="false"
>
</Freetext>
@@ -471,7 +471,7 @@
<Page
name="ask_server_address"
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html"
- jumpScript="__WIZ_HOME__/server_wizard/scripts/check_server_ip.sh"
+ jumpScript="/usr/share/wizards/server_wizard/scripts/check_server_ip.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
diff --git a/time_wizard/time.wiz b/time_wizard/time.wiz
index 9a4c7dcf..508fedfa 100644
--- a/time_wizard/time.wiz
+++ b/time_wizard/time.wiz
@@ -3,10 +3,10 @@
<Wizard
name="general"
- libScript="__WIZ_HOME__/common/scripts/functions.sh"
+ libScript="/usr/share/wizards/common/scripts/functions.sh"
wizardTitle="Time wizard"
imagePosition="top"
- defaultImage="__WIZ_HOME__/time_wizard/images/Time"
+ defaultImage="/usr/share/wizards/time_wizard/images/Time"
>
<Variable
@@ -61,7 +61,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html"
name="welcome"
- jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
+ jumpScript="/usr/share/wizards/common/scripts/check.sh root wiz_ip_net"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -116,7 +116,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html"
name="choice_setting"
- jumpScript="__WIZ_HOME__/time_wizard/scripts/handle_local_internet.sh"
+ jumpScript="/usr/share/wizards/time_wizard/scripts/handle_local_internet.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -220,7 +220,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html"
name="no_network"
- jumpScript="__WIZ_HOME__/time_wizard/scripts/install_rpm.sh"
+ jumpScript="/usr/share/wizards/time_wizard/scripts/install_rpm.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -268,7 +268,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html"
name="no_tools"
- jumpScript="__WIZ_HOME__/time_wizard/scripts/install_rpm.sh"
+ jumpScript="/usr/share/wizards/time_wizard/scripts/install_rpm.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -311,7 +311,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html"
name="not_installed"
- jumpScript="__WIZ_HOME__/time_wizard/scripts/test_tools.sh"
+ jumpScript="/usr/share/wizards/time_wizard/scripts/test_tools.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -740,7 +740,7 @@
name="wiz_timezone"
variableName="wiz_timezone"
defaultOptionScript="get_var wiz_timezone"
- fillScript="__WIZ_HOME__/time_wizard/scripts/compute_liste.sh"
+ fillScript="/usr/share/wizards/time_wizard/scripts/compute_liste.sh"
helpText="Choose a time zone:"
helpFontName="Default"
helpFontStyle="plain"
@@ -753,7 +753,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html"
name="test_server"
- jumpScript="__WIZ_HOME__/time_wizard/scripts/test_timeservers.sh"
+ jumpScript="/usr/share/wizards/time_wizard/scripts/test_timeservers.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -834,7 +834,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html"
name="server_not_responding"
- jumpScript="__WIZ_HOME__/time_wizard/scripts/handle_no_network.sh"
+ jumpScript="/usr/share/wizards/time_wizard/scripts/handle_no_network.sh"
executionLevel="NORMAL"
nextFinish="false"
canBack="true"
@@ -954,7 +954,7 @@
<Page
helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html"
name="error_need_net"
- subWizard="__WIZ_HOME__/server_wizard/server.wiz"
+ subWizard="/usr/share/wizards/server_wizard/server.wiz"
executionLevel="NORMAL"
nextFinish="false"
canBack="false"
diff --git a/web_wizard/scripts/Webconf.pm b/web_wizard/scripts/Webconf.pm
index 06a17fa5..be697513 100644
--- a/web_wizard/scripts/Webconf.pm
+++ b/web_wizard/scripts/Webconf.pm
@@ -1,8 +1,8 @@
#!/usr/bin/perl
package Webconf;
-require "__WIZ_HOME__/common/scripts/Vareqval.pm";
-require "__WIZ_HOME__/common/scripts/DrakconnectConf.pm";
+require "/usr/share/wizards/common/scripts/Vareqval.pm";
+require "/usr/share/wizards/common/scripts/DrakconnectConf.pm";
use MDK::Common;
use strict;
diff --git a/web_wizard/web.wiz b/web_wizard/web.wiz
index 4adcf3e0..93391c0e 100644
--- a/web_wizard/web.wiz
+++ b/web_wizard/web.wiz
@@ -3,11 +3,11 @@
<Wizard
name="general"
- libScript="__WIZ_HOME__/common/scripts/functions.sh"
+ libScript="/usr/share/wizards/common/scripts/functions.sh"
wizardTitle="Web wizard"
imagePosition="top"
- defaultImage="__WIZ_HOME__/web_wizard/images/apache"
- perlModule="__WIZ_HOME__/web_wizard/scripts/Webconf.pm"
+ defaultImage="/usr/share/wizards/web_wizard/images/apache"
+ perlModule="/usr/share/wizards/web_wizard/scripts/Webconf.pm"
rpm="apache-conf"
>