diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2010-01-21 22:56:12 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2010-01-21 22:56:12 +0000 |
| commit | 66832c03b48b99605cc0373982a07146d2cb2671 (patch) | |
| tree | 608cf9cfe7380cd847edf4a83c6293d15fe5712b | |
| parent | 2686f3731a0db6d9b0b0682f0563ac1ebfa4872e (diff) | |
| download | control-center-66832c03b48b99605cc0373982a07146d2cb2671.tar control-center-66832c03b48b99605cc0373982a07146d2cb2671.tar.gz control-center-66832c03b48b99605cc0373982a07146d2cb2671.tar.bz2 control-center-66832c03b48b99605cc0373982a07146d2cb2671.tar.xz control-center-66832c03b48b99605cc0373982a07146d2cb2671.zip | |
share version more widely (needed for next commit)
| -rwxr-xr-x | control-center | 2 | ||||
| -rwxr-xr-x | lib/MDV/Control_Center.pm | 4 |
2 files changed, 5 insertions, 1 deletions
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"); |