diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:27:18 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:27:18 +0000 |
| commit | c10299d7656ea3a780b0970795ddbca1335b96fe (patch) | |
| tree | 34a2c1923fd82f0360d5d35765e53b918b87e5d5 | |
| parent | dec0e265a040825600d2e7b276cbcdaa517e0cee (diff) | |
| download | drakx-c10299d7656ea3a780b0970795ddbca1335b96fe.tar drakx-c10299d7656ea3a780b0970795ddbca1335b96fe.tar.gz drakx-c10299d7656ea3a780b0970795ddbca1335b96fe.tar.bz2 drakx-c10299d7656ea3a780b0970795ddbca1335b96fe.tar.xz drakx-c10299d7656ea3a780b0970795ddbca1335b96fe.zip | |
(init_path) split it out of main()
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/install2.pm | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index f3a06e4b9..43a16efb8 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,6 +1,7 @@ - kill last remanents of kernel-2.4.x support - package group selection: o remember minimal install values when clicking "previous" +- refactoring Version 14.22 - 15 May 2012 diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm index a3237267e..5ff92fb59 100644 --- a/perl-install/install/install2.pm +++ b/perl-install/install/install2.pm @@ -530,6 +530,12 @@ sub init_env_share() { } } +sub init_path() { + #- make sure we do not pick up any gunk from the outside world + my $remote_path = "$::prefix/sbin:$::prefix/bin:$::prefix/usr/sbin:$::prefix/usr/bin"; + $ENV{PATH} = "/usr/bin:/bin:/sbin:/usr/sbin:$remote_path"; +} + sub init_mouse() { eval { $o->{mouse} = mouse::detect($o->{modules_conf}) } if !$o->{mouse} && !$o->{nomouseprobe}; mouse::load_modules($o->{mouse}); @@ -591,9 +597,7 @@ sub main { $o->{prefix} = $::prefix = $::testing ? "/tmp/test-perl-install" : "/mnt"; mkdir $::prefix, 0755; - #- make sure we do not pick up any gunk from the outside world - my $remote_path = "$::prefix/sbin:$::prefix/bin:$::prefix/usr/sbin:$::prefix/usr/bin"; - $ENV{PATH} = "/usr/bin:/bin:/sbin:/usr/sbin:$remote_path"; + init_path(); eval { install::any::spawnShell() }; |