From 66832c03b48b99605cc0373982a07146d2cb2671 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 21 Jan 2010 22:56:12 +0000 Subject: share version more widely (needed for next commit) --- control-center | 2 +- lib/MDV/Control_Center.pm | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/control-center b/control-center index 0e01ee8c..ae2206d1 100755 --- a/control-center +++ b/control-center @@ -41,7 +41,7 @@ use MDV::Control_Center; my (%tool_pids, %tool_feedback, $gurpmi_pid); -my ($version, $conffile, $class_install) = (`cat /etc/mandrakelinux-release` =~ /\b(\d+\.{1}.+\))/, "/etc/mcc.conf", "/etc/sysconfig/system"); +my ($conffile, $class_install) = ('/etc/mcc.conf', '/etc/sysconfig/system'); my ($rootwin_width, $rootwin_height) = gtkroot()->get_size; my $default_width = $rootwin_width <= 800 ? 720 : 800; diff --git a/lib/MDV/Control_Center.pm b/lib/MDV/Control_Center.pm index d54a27f6..47bfa496 100755 --- a/lib/MDV/Control_Center.pm +++ b/lib/MDV/Control_Center.pm @@ -31,8 +31,12 @@ our @EXPORT = qw( $bindir $sbindir $xbindir $mcc_dir $themes_dir %programs + $version ); +our $version = `cat /etc/mandrakelinux-release` =~ /\b(\d+\.{1}.+\))/; + + #------------------------------------------------------------- # paths our ($bindir, $sbindir, $xbindir) = ("/usr/bin", "/usr/sbin", "/usr/X11R6/bin"); -- cgit v1.2.1