diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2010-01-27 18:25:45 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2010-01-27 18:25:45 +0000 |
| commit | 88c15b7870425a762b08f9f3ac4e2d167e0675b6 (patch) | |
| tree | a0499608a76fbffec4665cb12a4588d358f92052 | |
| parent | f90fcaed78b9bfedea9b019f23eb6741dee605ce (diff) | |
| download | control-center-88c15b7870425a762b08f9f3ac4e2d167e0675b6.tar control-center-88c15b7870425a762b08f9f3ac4e2d167e0675b6.tar.gz control-center-88c15b7870425a762b08f9f3ac4e2d167e0675b6.tar.bz2 control-center-88c15b7870425a762b08f9f3ac4e2d167e0675b6.tar.xz control-center-88c15b7870425a762b08f9f3ac4e2d167e0675b6.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 2740eb54..ac03fc66 100755 --- a/control-center +++ b/control-center @@ -41,7 +41,7 @@ use MDV::Control_Center; my (%tool_pids, %tool_feedback); -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 2d9f0822..564ae4a1 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"); |