summaryrefslogtreecommitdiffstats
path: root/lib/MDV
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-09-05 09:18:26 +0100
committerColin Guthrie <colin@mageia.org>2013-09-05 09:46:52 +0100
commit989911bc0645c8ecf05ac535f8392cbfca5a4bdb (patch)
tree116377081aaeab2715061fe7a3000b519bdb72f4 /lib/MDV
parentb4d97e8277eb0bd8d16f50ab2a58a27b878ff3e5 (diff)
downloadcontrol-center-989911bc0645c8ecf05ac535f8392cbfca5a4bdb.tar
control-center-989911bc0645c8ecf05ac535f8392cbfca5a4bdb.tar.gz
control-center-989911bc0645c8ecf05ac535f8392cbfca5a4bdb.tar.bz2
control-center-989911bc0645c8ecf05ac535f8392cbfca5a4bdb.tar.xz
control-center-989911bc0645c8ecf05ac535f8392cbfca5a4bdb.zip
Drop the hardcoded binary path from the programs.
Instead use a very basic heuristic to find them and inject the full path when needed. This allows those programs which have been converted to polkit (and thus have binary path in /usr/bin) to happily coexist with ones which have not (and thus have path in /usr/sbin). Long term goal is to put all binaries in /usr/bin and ditch any kind of reliance on PATH as a fundamental separator. The tools which need root privs should either be wrapped in polkit policy or simply refuse to run. mga#11125
Diffstat (limited to 'lib/MDV')
-rwxr-xr-xlib/MDV/Control_Center.pm126
1 files changed, 62 insertions, 64 deletions
diff --git a/lib/MDV/Control_Center.pm b/lib/MDV/Control_Center.pm
index 40588cbf..edd99f00 100755
--- a/lib/MDV/Control_Center.pm
+++ b/lib/MDV/Control_Center.pm
@@ -28,7 +28,6 @@ use common;
use Exporter;
our @ISA = qw(Exporter);
our @EXPORT = qw(
- $bindir $sbindir $xbindir
$mcc_dir $themes_dir
%programs
$version
@@ -39,7 +38,6 @@ our ($version) = cat_("/etc/mandrakelinux-release") =~ /\b(\d+\.\d+)/;
#-------------------------------------------------------------
# paths
-our ($bindir, $sbindir, $xbindir) = ("/usr/bin", "/usr/sbin", "/usr/X11R6/bin");
our $mcc_dir = "/usr/share/mcc";
our $themes_dir = "$mcc_dir/themes/";
@@ -50,7 +48,7 @@ our %programs =
(
"3D" =>
{
- binary => "$sbindir/drak3d",
+ binary => "drak3d",
embedded => 1,
description => N("Configure 3D Desktop effects"),
long_description => N("Configure 3D Desktop effects"),
@@ -60,7 +58,7 @@ our %programs =
"Authentication" =>
{
- binary => "$sbindir/drakauth",
+ binary => "drakauth",
embedded => 1,
description =>
#-PO: this message is already translated in drakx domain from which MCC will searchs it:
@@ -72,7 +70,7 @@ our %programs =
"Auto login Config" =>
{
- binary => "$sbindir/drakboot",
+ binary => "drakboot",
embedded => 1,
description => N("Set up autologin to automatically log in"),
long_description => N("Enable autologin and select the user to automatically log in"),
@@ -82,7 +80,7 @@ our %programs =
"Backups" =>
{
- binary => "$sbindir/drakbackup",
+ binary => "drakbackup",
embedded => 1,
description => N("Backups"),
long_description => N("Configure backups of the system and of the users' data"),
@@ -93,7 +91,7 @@ our %programs =
"Snapshots" =>
{
- binary => "$sbindir/draksnapshot-config",
+ binary => "draksnapshot-config",
embedded => 1,
description => N("Snapshots"),
long_description => '',
@@ -103,7 +101,7 @@ our %programs =
"Boot Config" =>
{
- binary => "$sbindir/drakboot --boot",
+ binary => "drakboot --boot",
embedded => 1,
description => N("Set up boot system"),
long_description => N("Set up how the system boots"),
@@ -113,7 +111,7 @@ our %programs =
"Boot Theme" =>
{
- binary => "$sbindir/drakboot --splash",
+ binary => "drakboot --splash",
embedded => 1,
description => N("Set up boot graphical theme of system"),
long_description => N("Select the graphical theme of the system while booting"),
@@ -123,7 +121,7 @@ our %programs =
"Connection Sharing" =>
{
- binary => "$sbindir/drakgw",
+ binary => "drakgw",
embedded => 1,
description => N("Share the Internet connection with other local machines"),
long_description => N("Share the Internet connection with other local machines"),
@@ -133,7 +131,7 @@ our %programs =
"Add Connection" =>
{
- binary => "$sbindir/drakconnect --wizard",
+ binary => "drakconnect --wizard",
embedded => 1,
description => N("Set up a new network interface (LAN, ISDN, ADSL, ...)"),
long_description => N("Set up a new network interface (LAN, ISDN, ADSL, ...)"),
@@ -143,7 +141,7 @@ our %programs =
"Configure Internet" =>
{
- binary => "$sbindir/drakconnect --internet",
+ binary => "drakconnect --internet",
embedded => 1,
description => N("Internet access"),
long_description => N("Alter miscellaneous internet settings"),
@@ -153,7 +151,7 @@ our %programs =
"Console" =>
{
- binary => "$sbindir/drakconsole",
+ binary => "drakconsole",
embedded => 1,
description => N("Open a console as administrator"),
long_description => N("Open a console as administrator"),
@@ -164,7 +162,7 @@ our %programs =
"Date & Time" =>
{
- binary => "$sbindir/drakclock",
+ binary => "drakclock",
embedded => 1,
description => N("Manage date and time"),
long_description => N("Manage date and time"),
@@ -174,7 +172,7 @@ our %programs =
"Display Manager chooser" =>
{
- binary => "$sbindir/drakedm",
+ binary => "drakedm",
embedded => 1,
description => N("Set up display manager"),
long_description => N("Choose the display manager that enables to select which user to log in"),
@@ -184,7 +182,7 @@ our %programs =
"Fax" =>
{
- binary => "$sbindir/drakfax_server",
+ binary => "drakfax_server",
embedded => 1,
description => N("Configure a fax server"),
long_description => N("Configure a fax server"),
@@ -194,7 +192,7 @@ our %programs =
"Firewall" =>
{
- binary => "$sbindir/drakfirewall",
+ binary => "drakfirewall",
embedded => 1,
description => N("Set up your personal firewall"),
long_description => N("Set up a personal firewall in order to protect the computer and the network"),
@@ -204,7 +202,7 @@ our %programs =
"Fonts" =>
{
- binary => "$sbindir/drakfont",
+ binary => "drakfont",
embedded => 1,
description => N("Manage, add and remove fonts. Import Windows(TM) fonts"),
long_description => N("Manage, add and remove fonts. Import Windows(TM) fonts"),
@@ -214,7 +212,7 @@ our %programs =
"Graphical server configuration" =>
{
- binary => "$sbindir/XFdrake",
+ binary => "drakx11",
embedded => 1,
description => N("Set up the graphical server"),
long_description => N("Set up the graphical server"),
@@ -224,7 +222,7 @@ our %programs =
"Hard Drives" =>
{
- binary => "$sbindir/diskdrake --hd",
+ binary => "diskdrake --hd",
embedded => 1,
description => N("Manage disk partitions"),
long_description => N("Create, delete and resize hard disk partitions"),
@@ -234,7 +232,7 @@ our %programs =
"Hardware List" =>
{
- binary => "$sbindir/harddrake2",
+ binary => "drakhardware",
embedded => 1,
description => N("Browse and configure hardware"),
long_description => N("Browse and configure hardware"),
@@ -245,7 +243,7 @@ our %programs =
"Sound" =>
{
- binary => "$sbindir/draksound",
+ binary => "draksound",
embedded => 1,
description => N("Sound Configuration"),
long_description => N("Sound Configuration"),
@@ -255,7 +253,7 @@ our %programs =
"Hosts" =>
{
- binary => "$sbindir/drakhosts",
+ binary => "drakhosts",
embedded => 1,
description => N("Hosts definitions"),
long_description => N("Manage hosts definitions"),
@@ -265,7 +263,7 @@ our %programs =
"Install Software" =>
{
- binary => "$sbindir/rpmdrake",
+ binary => "drakrpm",
embedded => 1,
description => N("Install & Remove Software"),
long_description => N("Install, uninstall software"),
@@ -276,7 +274,7 @@ our %programs =
"Invictus Firewall" =>
{
- binary => "$sbindir/drakinvictus",
+ binary => "drakinvictus",
embedded => 1,
description => N("Advanced setup for network interfaces and firewall"),
long_description => N("Set up network interfaces failover and firewall replication"),
@@ -286,7 +284,7 @@ our %programs =
"Keyboard" =>
{
- binary => "$sbindir/keyboarddrake",
+ binary => "drakkeyboard",
embedded => 1,
description => N("Set up the keyboard layout"),
long_description => N("Set up the keyboard layout"),
@@ -296,7 +294,7 @@ our %programs =
"Kolab" =>
{
- binary => "$sbindir/kolab",
+ binary => "kolab",
embedded => 1,
description => N("Kolab"),
long_description => N("Set up a groupware server"),
@@ -305,7 +303,7 @@ our %programs =
"Localization" =>
{
- binary => "$bindir/localedrake",
+ binary => "draklocale",
embedded => 1,
icon => 'localedrake',
description => N("Manage localization for your system"),
@@ -315,7 +313,7 @@ our %programs =
"Logs" =>
{
- binary => "$sbindir/logdrake",
+ binary => "draklog",
embedded => 1,
description => N("View and search system logs"),
long_description => N("View and search system logs"),
@@ -325,7 +323,7 @@ our %programs =
"Manage Connection" =>
{
- binary => "$sbindir/drakconnect --skip-wizard",
+ binary => "drakconnect --skip-wizard",
embedded => 1,
description => N("Manage connections"),
long_description => N("Reconfigure a network interface"),
@@ -335,7 +333,7 @@ our %programs =
"Manage park" =>
{
- binary => "$sbindir/park-rpmdrake",
+ binary => "park-rpmdrake",
embedded => 1,
description => N("Manage computer group"),
long_description => N("Manage installed software packages on a group of computers"),
@@ -344,7 +342,7 @@ our %programs =
"Mageia Tools Authentication" =>
{
- binary => "$sbindir/draksec",
+ binary => "draksec",
embedded => 1,
description => N("Configure authentication for Mageia tools"),
long_description => N("Define authentication required to access individual Mageia configuration tools "),
@@ -353,7 +351,7 @@ our %programs =
"Mageia Update" =>
{
- binary => "$sbindir/MageiaUpdate",
+ binary => "MageiaUpdate",
embedded => 1,
description => N("Update your system"),
long_description => N("Look at available updates and apply any fixes or upgrades to installed packages"),
@@ -364,7 +362,7 @@ our %programs =
"Menus" =>
{
- binary => "$bindir/drakmenustyle",
+ binary => "drakmenustyle",
embedded => 1,
description => N("Menu Style"),
long_description => N("Menu Style Configuration"),
@@ -374,7 +372,7 @@ our %programs =
"Migration" =>
{
- binary => "$sbindir/transfugdrake",
+ binary => "transfugdrake",
embedded => 1,
description => N("Import Windows(TM) documents and settings"),
long_description => N("Import Windows(TM) documents and settings"),
@@ -384,7 +382,7 @@ our %programs =
"Monitor Connection" =>
{
- binary => "$sbindir/net_monitor",
+ binary => "net_monitor",
embedded => 1,
description => N("Monitor connections"),
long_description => N("Monitor the network connections"),
@@ -394,7 +392,7 @@ our %programs =
"Mouse" =>
{
- binary => "$sbindir/mousedrake",
+ binary => "drakmouse",
embedded => 1,
description => N("Set up the pointer device (mouse, touchpad)"),
long_description => N("Set up the pointer device (mouse, touchpad)"),
@@ -403,7 +401,7 @@ our %programs =
"Parental Controls" => {
- binary => "$sbindir/drakguard",
+ binary => "drakguard",
embedded => 1,
description => N("Parental Controls"),
long_description => N("Parental Controls"),
@@ -413,7 +411,7 @@ our %programs =
"Network Center" =>
{
- binary => "$sbindir/draknetcenter",
+ binary => "draknetcenter",
embedded => 1,
description => N("Network Center"),
long_description => N("Manage your network devices"),
@@ -423,7 +421,7 @@ our %programs =
"Network Profiles" =>
{
- binary => "$sbindir/draknetprofile",
+ binary => "draknetprofile",
embedded => 1,
description => N("Manage different network profiles"),
long_description => N("Activate and manage network profiles"),
@@ -433,7 +431,7 @@ our %programs =
"NFS mount points" =>
{
- binary => "$sbindir/diskdrake --nfs",
+ binary => "diskdrake --nfs",
embedded => 1,
description => N("Access NFS shared drives and directories"),
long_description => N("Set NFS mount points"),
@@ -443,7 +441,7 @@ our %programs =
"NFS exports" =>
{
- binary => "$sbindir/draknfs",
+ binary => "draknfs",
embedded => 1,
description => N("Share drives and directories using NFS"),
long_description => N("Manage NFS shares"),
@@ -454,7 +452,7 @@ our %programs =
"Package stats" =>
{
- binary => "$sbindir/drakstats",
+ binary => "drakstats",
embedded => 1,
description => N("Package Stats"),
long_description => N("Show statistics about usage of installed software packages"),
@@ -464,7 +462,7 @@ our %programs =
"Partition Sharing" =>
{
- binary => "$sbindir/diskdrake --fileshare",
+ binary => "diskdrake --fileshare",
embedded => 1,
description => N("Share your hard disk partitions"),
long_description => N("Set up sharing of your hard disk partitions"),
@@ -474,7 +472,7 @@ our %programs =
"Printer" =>
{
- binary => "$sbindir/system-config-printer",
+ binary => "system-config-printer",
embedded => 1,
description => N("Set up the printer(s), the print job queues, ..."),
icon => 'printer-mcc-mdk',
@@ -486,7 +484,7 @@ our %programs =
"Programs scheduling" =>
{
- binary => "$xbindir/drakcronat",
+ binary => "drakcronat",
embedded => 1,
description => N("Scheduled tasks"),
long_description => N("Schedule programs to run periodically or at given times"),
@@ -496,7 +494,7 @@ our %programs =
"Proxy Configuration" =>
{
- binary => "$sbindir/drakproxy",
+ binary => "drakproxy",
embedded => 1,
description => N("Proxy"),
long_description => N("Set up a proxy server for files and web browsing"),
@@ -505,7 +503,7 @@ our %programs =
"Remote Control" =>
{
- binary => "$bindir/rfbdrake",
+ binary => "rfbdrake",
embedded => 1,
description => N("Remote Control (Linux/Unix, Windows)"),
long_description => N("Remote Control of another machine (Linux/Unix, Windows)"),
@@ -515,7 +513,7 @@ our %programs =
"Remove Interface" =>
{
- binary => "$sbindir/drakconnect --del",
+ binary => "drakconnect --del",
embedded => 1,
description => N("Remove a connection"),
long_description => N("Delete a network interface"),
@@ -526,7 +524,7 @@ our %programs =
#- currently unused
"Roaming" =>
{
- binary => "$sbindir/drakroam",
+ binary => "drakroam",
embedded => 1,
description => N("Wireless connection"),
long_description => N("Wireless connection"),
@@ -536,7 +534,7 @@ our %programs =
"Access Windows shares" =>
{
- binary => "$sbindir/diskdrake --smb",
+ binary => "diskdrake --smb",
embedded => 1,
description => N("Access Windows (SMB) shared drives and directories"),
long_description => N("Configuration of Windows (Samba) shared drives and directories"),
@@ -546,7 +544,7 @@ our %programs =
"Samba configuration" =>
{
- binary => "$sbindir/draksambashare",
+ binary => "draksambashare",
embedded => 1,
description => N("Share drives and directories with Windows (SMB) systems"),
long_description => N("Manage configuration of Samba"),
@@ -556,7 +554,7 @@ our %programs =
"Scanner" =>
{
- binary => "$sbindir/scannerdrake",
+ binary => "drakscanner",
embedded => 1,
description => N("Set up scanner"),
long_description => N("Set up scanner"),
@@ -566,7 +564,7 @@ our %programs =
"Security Level" =>
{
- binary => "$sbindir/msecgui",
+ binary => "msecgui",
embedded => 1,
description => N("Configure system security, permissions and audit"),
long_description => N("Set the system security level, periodic security audit and permissions"),
@@ -577,7 +575,7 @@ our %programs =
"Services" =>
{
- binary => "$sbindir/drakxservices",
+ binary => "drakxservices",
embedded => 1,
description => N("Manage system services by enabling or disabling them"),
long_description => N("Manage system services by enabling or disabling them"),
@@ -587,7 +585,7 @@ our %programs =
"Software Media Manager" =>
{
- binary => "$sbindir/edit-urpm-sources.pl",
+ binary => "drakrpm-edit-media",
embedded => 1,
description => N("Configure media sources for install and update"),
long_description => N("Select from where software packages are downloaded "),
@@ -598,7 +596,7 @@ our %programs =
"Updates Configuration" =>
{
- binary => "$sbindir/mgaapplet-config",
+ binary => "mgaapplet-config",
embedded => 1,
description => N("Configure updates frequency"),
icon => 'rpmdrake-mdk',
@@ -607,7 +605,7 @@ our %programs =
"Extended Maintenance" =>
{
- binary => "$sbindir/mdkapplet-add-media-helper --product=extended $version",
+ binary => "mdkapplet-add-media-helper --product=extended $version",
embedded => 1,
description => N("Access to extended maintenance"),
icon => 'extended_maintenance',
@@ -616,7 +614,7 @@ our %programs =
"Tomoyo Policy" =>
{
- binary => "$sbindir/tomoyo-gui",
+ binary => "tomoyo-gui",
embedded => 1,
description => N("Configure TOMOYO Linux policy"),
long_description => N("View and configure TOMOYO Linux security policy"),
@@ -627,7 +625,7 @@ our %programs =
"UPS" =>
{
- binary => "$sbindir/drakups --wizard",
+ binary => "drakups --wizard",
embedded => 1,
description =>
#-PO: UPS==Uninterruptible power supply
@@ -642,7 +640,7 @@ our %programs =
"Users" =>
{
# too big
- binary => "$sbindir/userdrake",
+ binary => "userdrake",
embedded => 1,
description => N("Manage users on system"),
long_description => N("Add, remove or change users of the system"),
@@ -653,7 +651,7 @@ our %programs =
"Virtualization" =>
{
- binary => "$sbindir/drakvirt",
+ binary => "drakvirt",
embedded => 1,
description => N("Virtualization"),
long_description => N("Virtual machines management"),
@@ -663,7 +661,7 @@ our %programs =
"VPN" =>
{
- binary => "$sbindir/drakvpn",
+ binary => "drakvpn",
embedded => 1,
description => N("Configure VPN connection to secure network access"),
long_description => N("Configure VPN connection to secure network access"),
@@ -673,7 +671,7 @@ our %programs =
"WebDAV mount points" =>
{
- binary => "$sbindir/diskdrake --dav",
+ binary => "diskdrake --dav",
embedded => 1,
description => N("Access WebDAV shared drives and directories"),
long_description => N("Set WebDAV mount points"),