diff options
| -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(); |