From be424605afddcf72cd58fcc36f492f89162bc618 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 2 Dec 2002 17:42:22 +0000
Subject: use $::prefix

---
 perl-install/any.pm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'perl-install/any.pm')

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 9d703befe..3cded4dc1 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -358,25 +358,25 @@ sub pack_passwd {
 }
 
 sub get_autologin {
-    my ($prefix, $o) = @_;
-    my %l = getVarsFromSh("$prefix/etc/sysconfig/autologin");
+    my ($o) = @_;
+    my %l = getVarsFromSh("$::prefix/etc/sysconfig/autologin");
     $o->{autologin} ||= text2bool($l{AUTOLOGIN}) && $l{USER};
-    %l = getVarsFromSh("$prefix/etc/sysconfig/desktop");
+    %l = getVarsFromSh("$::prefix/etc/sysconfig/desktop");
     $o->{desktop} ||= $l{DESKTOP};
 }
 
 sub set_autologin {
-  my ($prefix, $user, $desktop) = @_;
+  my ($user, $desktop) = @_;
 
   if ($user) {
-      my %l = getVarsFromSh("$prefix/etc/sysconfig/desktop");
+      my %l = getVarsFromSh("$::prefix/etc/sysconfig/desktop");
       $l{DESKTOP} = $desktop;
-      setVarsInSh("$prefix/etc/sysconfig/desktop", \%l);
-      log::l("cat $prefix/etc/sysconfig/desktop ($desktop):\n", cat_("$prefix/etc/sysconfig/desktop"));
+      setVarsInSh("$::prefix/etc/sysconfig/desktop", \%l);
+      log::l("cat $::prefix/etc/sysconfig/desktop ($desktop):\n", cat_("$::prefix/etc/sysconfig/desktop"));
   }
-  setVarsInSh("$prefix/etc/sysconfig/autologin",
+  setVarsInSh("$::prefix/etc/sysconfig/autologin",
 	      { USER => $user, AUTOLOGIN => bool2yesno($user), EXEC => "/usr/X11R6/bin/startx" });
-  log::l("cat $prefix/etc/sysconfig/autologin ($user):\n", cat_("$prefix/etc/sysconfig/autologin"));
+  log::l("cat $::prefix/etc/sysconfig/autologin ($user):\n", cat_("$::prefix/etc/sysconfig/autologin"));
 }
 
 sub rotate_log {
@@ -800,9 +800,9 @@ sub ask_users {
 }
 
 sub autologin {
-    my ($prefix, $o, $in) = @_;
+    my ($o, $in) = @_;
 
-    my @wm = split(' ', run_program::rooted_get_stdout($prefix, '/usr/sbin/chksession', '-l'));
+    my @wm = split(' ', run_program::rooted_get_stdout($::prefix, '/usr/sbin/chksession', '-l'));
     my @users = map { $_->{name} } @{$o->{users} || []};
 
     if (@wm > 1 && @users && !$o->{authentication}{NIS} && $o->{security} <= 2) {
-- 
cgit v1.2.1

opic/MDK92-branch'>topic/MDK92-branch</option>
<option value='topic/MDKC_1_0'>topic/MDKC_1_0</option>
<option value='topic/PCMCIA_CS_DISTRO'>topic/PCMCIA_CS_DISTRO</option>
<option value='topic/R9_0-64bit-branch'>topic/R9_0-64bit-branch</option>
<option value='topic/R9_1_HP-branch'>topic/R9_1_HP-branch</option>
<option value='topic/a'>topic/a</option>
<option value='topic/before_matchbox_wm'>topic/before_matchbox_wm</option>
<option value='topic/bug-13680'>topic/bug-13680</option>
<option value='topic/dietlibc'>topic/dietlibc</option>
<option value='topic/efi'>topic/efi</option>
<option value='topic/extlinux'>topic/extlinux</option>
<option value='topic/firewall'>topic/firewall</option>
<option value='topic/gdk-pixbuf-0-branch'>topic/gdk-pixbuf-0-branch</option>
<option value='topic/gi-ppc'>topic/gi-ppc</option>
<option value='topic/ia64-8_1'>topic/ia64-8_1</option>
<option value='topic/mandrakesoft'>topic/mandrakesoft</option>
<option value='topic/mlcd4'>topic/mlcd4</option>
<option value='topic/ppp'>topic/ppp</option>
<option value='topic/rp-pppoe'>topic/rp-pppoe</option>
<option value='topic/switching_to_dnf'>topic/switching_to_dnf</option>
<option value='topic/switching_to_urpmi'>topic/switching_to_urpmi</option>
<option value='topic/unlabeled-1.1.1'>topic/unlabeled-1.1.1</option>
<option value='topic/v_webmin_0_87'>topic/v_webmin_0_87</option>
<option value='topic/x86_64-branch'>topic/x86_64-branch</option>
<option value='user/animtim/designWork'>user/animtim/designWork</option>
<option value='user/colin/rescue-systemd'>user/colin/rescue-systemd</option>
<option value='user/ennael/mga6'>user/ennael/mga6</option>
<option value='user/erwan/bug-13680'>user/erwan/bug-13680</option>
<option value='user/jibz/aarch64'>user/jibz/aarch64</option>
<option value='user/martinw/mga6'>user/martinw/mga6</option>
<option value='user/pterjan/arm64'>user/pterjan/arm64</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Mageia Installer and base platform for many utilities</td><td class='sub right'>Thierry Vignaud [tv]</td></tr></table>
<table class='tabs'><tr><td>
<a href='/software/drakx/?h=distro/mga7'>summary</a><a href='/software/drakx/refs/?h=distro/mga7&amp;id=046612a0de8eacaecb1914333f9d4facb4ac44cb'>refs</a><a href='/software/drakx/log/perl-install/share/po?h=distro/mga7'>log</a><a href='/software/drakx/tree/perl-install/share/po?h=distro/mga7&amp;id=046612a0de8eacaecb1914333f9d4facb4ac44cb'>tree</a><a class='active' href='/software/drakx/commit/perl-install/share/po?h=distro/mga7&amp;id=046612a0de8eacaecb1914333f9d4facb4ac44cb'>commit</a><a href='/software/drakx/diff/perl-install/share/po?h=distro/mga7&amp;id=046612a0de8eacaecb1914333f9d4facb4ac44cb'>diff</a><a href='/software/drakx/stats/perl-install/share/po?h=distro/mga7'>stats</a></td><td class='form'><form class='right' method='get' action='/software/drakx/log/perl-install/share/po'>
<input type='hidden' name='h' value='distro/mga7'/><input type='hidden' name='id' value='046612a0de8eacaecb1914333f9d4facb4ac44cb'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/software/drakx/commit/?h=distro/mga7&amp;id=046612a0de8eacaecb1914333f9d4facb4ac44cb'>root</a>/<a href='/software/drakx/commit/perl-install?h=distro/mga7&amp;id=046612a0de8eacaecb1914333f9d4facb4ac44cb'>perl-install</a>/<a href='/software/drakx/commit/perl-install/share?h=distro/mga7&amp;id=046612a0de8eacaecb1914333f9d4facb4ac44cb'>share</a>/<a href='/software/drakx/commit/perl-install/share/po?h=distro/mga7&amp;id=046612a0de8eacaecb1914333f9d4facb4ac44cb'>po</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='distro/mga7'/><input type='hidden' name='id' value='046612a0de8eacaecb1914333f9d4facb4ac44cb'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Pablo Saratxaga &lt;pablo@mandriva.com&gt;</td><td class='right'>2005-03-03 09:19:59 +0000</td></tr>
<tr><th>committer</th><td>Pablo Saratxaga &lt;pablo@mandriva.com&gt;</td><td class='right'>2005-03-03 09:19:59 +0000</td></tr>
<tr><th>commit</th><td colspan='2' class='sha1'><a href='/software/drakx/commit/perl-install/share/po?h=distro/mga7&amp;id=046612a0de8eacaecb1914333f9d4facb4ac44cb'>046612a0de8eacaecb1914333f9d4facb4ac44cb</a> (<a href='/software/drakx/patch/perl-install/share/po?id=046612a0de8eacaecb1914333f9d4facb4ac44cb'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='sha1'><a href='/software/drakx/tree/?h=distro/mga7&amp;id=046612a0de8eacaecb1914333f9d4facb4ac44cb'>2823e1dad3faef650147d3bfa83f3c8266227eb5</a> /<a href='/software/drakx/tree/perl-install/share/po?h=distro/mga7&amp;id=046612a0de8eacaecb1914333f9d4facb4ac44cb'>perl-install/share/po</a></td></tr>
<tr><th>parent</th><td colspan='2' class='sha1'><a href='/software/drakx/commit/perl-install/share/po?h=distro/mga7&amp;id=854e603dc751754d1e86712056e5553376ca8f8e'>854e603dc751754d1e86712056e5553376ca8f8e</a> (<a href='/software/drakx/diff/perl-install/share/po?h=distro/mga7&amp;id=046612a0de8eacaecb1914333f9d4facb4ac44cb&amp;id2=854e603dc751754d1e86712056e5553376ca8f8e'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='sha1'><a href='/software/drakx/snapshot/drakx-046612a0de8eacaecb1914333f9d4facb4ac44cb.tar'>drakx-046612a0de8eacaecb1914333f9d4facb4ac44cb.tar</a><br/><a href='/software/drakx/snapshot/drakx-046612a0de8eacaecb1914333f9d4facb4ac44cb.tar.gz'>drakx-046612a0de8eacaecb1914333f9d4facb4ac44cb.tar.gz</a><br/><a href='/software/drakx/snapshot/drakx-046612a0de8eacaecb1914333f9d4facb4ac44cb.tar.bz2'>drakx-046612a0de8eacaecb1914333f9d4facb4ac44cb.tar.bz2</a><br/><a href='/software/drakx/snapshot/drakx-046612a0de8eacaecb1914333f9d4facb4ac44cb.tar.xz'>drakx-046612a0de8eacaecb1914333f9d4facb4ac44cb.tar.xz</a><br/><a href='/software/drakx/snapshot/drakx-046612a0de8eacaecb1914333f9d4facb4ac44cb.zip'>drakx-046612a0de8eacaecb1914333f9d4facb4ac44cb.zip</a><br/></td></tr></table>
<div class='commit-subject'>Added translation for "recommended" string</div><div class='commit-msg'></div><div class='diffstat-header'><a href='/software/drakx/diff/?h=distro/mga7&amp;id=046612a0de8eacaecb1914333f9d4facb4ac44cb'>Diffstat</a> (limited to 'perl-install/share/po')</div><table summary='diffstat' class='diffstat'>