From fc9772f1f03684e8dab50ff77d2c46c5e0309c7b Mon Sep 17 00:00:00 2001 From: Angelo Naselli Date: Mon, 16 Mar 2015 18:16:50 +0100 Subject: Moved to namespace to ManaTools --- extras/README | 6 +++--- extras/conf/categories.conf | 12 ++++++------ extras/conf/categories.conf.d/manaservice.conf | 2 +- extras/conf/categories.conf.d/manauser.conf | 2 +- extras/desktop/manaclock.desktop | 2 +- extras/desktop/manadm.desktop | 2 +- extras/desktop/manahost.desktop | 2 +- extras/desktop/manalog.desktop | 2 +- extras/desktop/manaproxy.desktop | 2 +- extras/desktop/manaservice.desktop | 2 +- extras/desktop/manauser.desktop | 2 +- extras/desktop/manauserlog.desktop | 2 +- extras/desktop/manawall.desktop | 2 +- extras/desktop/mpan.desktop | 4 ++-- extras/setup.sh | 22 +++++++++++----------- 15 files changed, 33 insertions(+), 33 deletions(-) (limited to 'extras') diff --git a/extras/README b/extras/README index 8bb98c5..465d699 100644 --- a/extras/README +++ b/extras/README @@ -1,7 +1,7 @@ Configure polkit ---------------- -Please copy extras/org.mageia.policykit.pkexec.adminpanel.policy to /usr/share/polkit-1/actions/org.mageia.policykit.pkexec.adminpanel.policy +Please copy extras/org.mageia.policykit.pkexec.manatools.policy to /usr/share/polkit-1/actions/org.mageia.policykit.pkexec.manatools.policy to make apanel be usable through policykit (mcc is currently using pam, a bit more complicated compared to polkit). After that you have to make a symbolic link to apanel.pl into /usr/bin/ (i.e. /usr/bin/apanel.pl) and make your local apanel.pl script executable (chmod +x apanel.pl). @@ -33,10 +33,10 @@ xhost local:root 5. setup apanel.pl to use consolehelper backend ($USE_CHLP) -Add AdminPanel to the include path (for developers) +Add ManaTools to the include path (for developers) --------------------------------------------------- -symlink trunk/AdminPanel to /usr/lib/perl5//AdminPanel +symlink trunk/ManaTools to /usr/lib/perl5//ManaTools where currentversion could be for example 5.16.2 Additional notes: diff --git a/extras/conf/categories.conf b/extras/conf/categories.conf index 774d031..5bfac57 100644 --- a/extras/conf/categories.conf +++ b/extras/conf/categories.conf @@ -23,34 +23,34 @@ System /usr/share/icons/system_section.png - AdminPanel::Module::LogViewer + ManaTools::Module::LogViewer - AdminPanel::Module::Clock + ManaTools::Module::Clock Network && Internet /usr/share/icons/networking_section.png - AdminPanel::Module::Hosts + ManaTools::Module::Hosts - AdminPanel::Module::Proxy + ManaTools::Module::Proxy Security /usr/share/icons/security_section.png - AdminPanel::Module::Firewall + ManaTools::Module::Firewall Boot /usr/share/icons/boot_init_section.png - AdminPanel::Module::DisplayManager + ManaTools::Module::DisplayManager diff --git a/extras/conf/categories.conf.d/manaservice.conf b/extras/conf/categories.conf.d/manaservice.conf index 304f75e..61c3bd0 100644 --- a/extras/conf/categories.conf.d/manaservice.conf +++ b/extras/conf/categories.conf.d/manaservice.conf @@ -4,7 +4,7 @@ System /usr/share/icons/system_section.png - AdminPanel::Module::Services + ManaTools::Module::Services diff --git a/extras/conf/categories.conf.d/manauser.conf b/extras/conf/categories.conf.d/manauser.conf index 85dba9f..99ed6d0 100644 --- a/extras/conf/categories.conf.d/manauser.conf +++ b/extras/conf/categories.conf.d/manauser.conf @@ -4,7 +4,7 @@ System /usr/share/icons/system_section.png - AdminPanel::Module::Users + ManaTools::Module::Users diff --git a/extras/desktop/manaclock.desktop b/extras/desktop/manaclock.desktop index c193d61..9fd261a 100644 --- a/extras/desktop/manaclock.desktop +++ b/extras/desktop/manaclock.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=manaclock -Comment=AdminPanel clock manager +Comment=ManaTools clock manager Exec=mana clock Icon=/usr/share/icons/manaclock.png Type=Application diff --git a/extras/desktop/manadm.desktop b/extras/desktop/manadm.desktop index 7e37fd0..d10c057 100644 --- a/extras/desktop/manadm.desktop +++ b/extras/desktop/manadm.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=manadm -Comment=AdminPanel login manager configuration +Comment=ManaTools login manager configuration Exec=mana dm Icon=/usr/share/icons/manadm.png Type=Application diff --git a/extras/desktop/manahost.desktop b/extras/desktop/manahost.desktop index 0823c39..2e63851 100644 --- a/extras/desktop/manahost.desktop +++ b/extras/desktop/manahost.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=manahost -Comment=AdminPanel host manager +Comment=ManaTools host manager Exec=mana host Icon=/usr/share/icons/manahost.png Type=Application diff --git a/extras/desktop/manalog.desktop b/extras/desktop/manalog.desktop index 3dc6d88..b87b9f3 100644 --- a/extras/desktop/manalog.desktop +++ b/extras/desktop/manalog.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=manalog admin mode -Comment=AdminPanel log viewer +Comment=ManaTools log viewer Exec=mana log Icon=/usr/share/icons/manalog.png Type=Application diff --git a/extras/desktop/manaproxy.desktop b/extras/desktop/manaproxy.desktop index 23d39bb..db8766a 100644 --- a/extras/desktop/manaproxy.desktop +++ b/extras/desktop/manaproxy.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=manaproxy -Comment=AdminPanel proxy manager +Comment=ManaTools proxy manager Exec=mana proxy Icon=/usr/share/icons/manaproxy.png Type=Application diff --git a/extras/desktop/manaservice.desktop b/extras/desktop/manaservice.desktop index e5dec7a..0196408 100644 --- a/extras/desktop/manaservice.desktop +++ b/extras/desktop/manaservice.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=manaservice -Comment=AdminPanel service manager +Comment=ManaTools service manager Exec=mana service Icon=/usr/share/icons/manaservice.png Type=Application diff --git a/extras/desktop/manauser.desktop b/extras/desktop/manauser.desktop index 87397de..b72c5a9 100644 --- a/extras/desktop/manauser.desktop +++ b/extras/desktop/manauser.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=manauser -Comment=AdminPanel user manager +Comment=ManaTools user manager Exec=mana user Icon=/usr/share/icons/manauser.png Type=Application diff --git a/extras/desktop/manauserlog.desktop b/extras/desktop/manauserlog.desktop index 3b33b9e..2d60730 100644 --- a/extras/desktop/manauserlog.desktop +++ b/extras/desktop/manauserlog.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=manalog user mode -Comment=AdminPanel log viewer +Comment=ManaTools log viewer Exec=/usr/bin/manalog Icon=/usr/share/icons/manalog.png Type=Application diff --git a/extras/desktop/manawall.desktop b/extras/desktop/manawall.desktop index 8a2d93d..2c5b54f 100644 --- a/extras/desktop/manawall.desktop +++ b/extras/desktop/manawall.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=manawall -Comment=AdminPanel firewall configurator +Comment=ManaTools firewall configurator Exec=mana wall Icon=/usr/share/icons/manawall.png Type=Application diff --git a/extras/desktop/mpan.desktop b/extras/desktop/mpan.desktop index 6ea0389..df3df29 100644 --- a/extras/desktop/mpan.desktop +++ b/extras/desktop/mpan.desktop @@ -1,6 +1,6 @@ [Desktop Entry] -Name=Mageia AdminPanel -Comment=Administration panel - application launcher +Name=Mageia ManaTools +Comment=Mana-tools panel - application launcher Exec=mana pan Icon=/usr/share/icons/mpan.png Type=Application diff --git a/extras/setup.sh b/extras/setup.sh index bbb0645..a45a980 100755 --- a/extras/setup.sh +++ b/extras/setup.sh @@ -1,7 +1,7 @@ #!/bin/bash # vim: set et ts=4 sw=4: -apanel=`rpm --eval %perl_privlib`/AdminPanel +apanel=`rpm --eval %perl_privlib`/ManaTools function check_root_permissions { @@ -13,17 +13,17 @@ function check_root_permissions function uninstall { - echo "== Uninstalling AdminPanel..." + echo "== Uninstalling ManaTools..." if [ -L $apanel ] then unlink $apanel fi - - if [ -f /usr/share/polkit-1/actions/org.mageia.policykit.pkexec.adminpanel.policy ] + + if [ -f /usr/share/polkit-1/actions/org.mageia.policykit.pkexec.manatools.policy ] then - rm /usr/share/polkit-1/actions/org.mageia.policykit.pkexec.adminpanel.policy + rm /usr/share/polkit-1/actions/org.mageia.policykit.pkexec.manatools.policy fi - + if [ -f /usr/bin/apanel.pl ] then unlink /usr/bin/apanel.pl @@ -45,11 +45,11 @@ function uninstall_xhost_conf { } function setup { - echo "== Installing AdminPanel..." + echo "== Installing ManaTools..." pushd . cd .. - cp extras/org.mageia.policykit.pkexec.adminpanel.policy /usr/share/polkit-1/actions/ - ln -s $PWD/AdminPanel `rpm --eval %perl_privlib` + cp extras/org.mageia.policykit.pkexec.manatools.policy /usr/share/polkit-1/actions/ + ln -s $PWD/ManaTools `rpm --eval %perl_privlib` ln -s $PWD/apanel.pl /usr/bin popd echo "== Done" @@ -57,8 +57,8 @@ function setup { function usage { echo "Usage:" - echo "--remove uninstall AdminPanel references" - echo "--install install AdminPanel references" + echo "--remove uninstall ManaTools references" + echo "--install install ManaTools references" echo "--privilege define the authentication method to gain privileges (NOT IMPLEMENTED YET)" } -- cgit v1.2.1