diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-01-26 13:46:09 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-01-26 13:46:09 +0000 |
| commit | 4798bf4d9ffebea5b15aed010dcf0b1c68276920 (patch) | |
| tree | c78d13e9f83c730555d5a6c0266626e5c5334964 /perl-install | |
| parent | 1dd5bd402363f18ce9d079c4f3cb52ccfdbf96dc (diff) | |
| download | drakx-4798bf4d9ffebea5b15aed010dcf0b1c68276920.tar drakx-4798bf4d9ffebea5b15aed010dcf0b1c68276920.tar.gz drakx-4798bf4d9ffebea5b15aed010dcf0b1c68276920.tar.bz2 drakx-4798bf4d9ffebea5b15aed010dcf0b1c68276920.tar.xz drakx-4798bf4d9ffebea5b15aed010dcf0b1c68276920.zip | |
drakx_version() is now in install_any and use getFile() to get VERSION
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/any.pm | 5 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 9207245f2..13bd1fe67 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -19,11 +19,6 @@ use log; use fs; use c; -sub drakx_version() { - $::move ? sprintf "DrakX-move v%s", cat_('/usr/bin/stage2/move.pm') =~ /move\.pm,v (\S+ \S+ \S+)/ - : sprintf "DrakX v%s built %s", $::testing ? ('TEST', scalar gmtime()) : (split('/', cat_("$ENV{SHARE_PATH}/VERSION")))[2,3]; -} - sub facesdir() { "$::prefix/usr/share/mdk/faces/"; } diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index ab29833ec..46549f9a6 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -33,6 +33,11 @@ $asked_medium = $boot_medium; our $global_ftp_prefix; +sub drakx_version() { + $::move ? sprintf "DrakX-move v%s", cat_('/usr/bin/stage2/move.pm') =~ /move\.pm,v (\S+ \S+ \S+)/ + : sprintf "DrakX v%s built %s", $::testing ? ('TEST', scalar gmtime()) : (split('/', cat__(getFile("install/stage2/VERSION"))))[2,3]; +} + #-###################################################################################### #- Media change variables&functions #-###################################################################################### @@ -297,7 +302,7 @@ sub spawnShell() { open STDERR, ">&F" or goto cant_spawn; close F; - print any::drakx_version(), "\n"; + print drakx_version(), "\n"; c::setsid(); |