aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngelo Naselli <anaselli@linux.it>2014-12-10 18:22:14 +0100
committerAngelo Naselli <anaselli@linux.it>2014-12-10 18:22:14 +0100
commit35359e4f0abdf7bccb915866cd464cc5a0ea5474 (patch)
treef279f5973dc983933f76201375aabbba3feb8f7e
parent742aef75e939b44cbeccc5304e265b6fa59235d2 (diff)
downloadmanatools-35359e4f0abdf7bccb915866cd464cc5a0ea5474.tar
manatools-35359e4f0abdf7bccb915866cd464cc5a0ea5474.tar.gz
manatools-35359e4f0abdf7bccb915866cd464cc5a0ea5474.tar.bz2
manatools-35359e4f0abdf7bccb915866cd464cc5a0ea5474.tar.xz
manatools-35359e4f0abdf7bccb915866cd464cc5a0ea5474.zip
moved mpan.pl to mpan, easier to run by command line
-rw-r--r--MANIFEST2
-rw-r--r--Makefile.PL2
-rw-r--r--extras/polkit/org.mageia.mpan.policy2
-rwxr-xr-xscripts/mana2
-rwxr-xr-xscripts/mpan (renamed from scripts/mpan.pl)10
5 files changed, 9 insertions, 9 deletions
diff --git a/MANIFEST b/MANIFEST
index 38d3fb9f..b8d53adb 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -78,7 +78,7 @@ scripts/manalog
scripts/manaproxy
scripts/manaservice
scripts/manauser
-scripts/mpan.pl
+scripts/mpan
share/images/Blank16x16.png
share/images/Check.png
share/images/Check_16x16.png
diff --git a/Makefile.PL b/Makefile.PL
index e380a1e8..834e6e03 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -62,7 +62,7 @@ WriteMakefile(
"Modern::Perl" => 1.03,
"autodie" => 2.20,
},
- EXE_FILES => [ qw( scripts/mpan.pl
+ EXE_FILES => [ qw( scripts/mpan
scripts/mana
scripts/manaadduser
scripts/manaclock
diff --git a/extras/polkit/org.mageia.mpan.policy b/extras/polkit/org.mageia.mpan.policy
index 5d793cf1..1597cc8e 100644
--- a/extras/polkit/org.mageia.mpan.policy
+++ b/extras/polkit/org.mageia.mpan.policy
@@ -15,7 +15,7 @@
<allow_inactive>auth_admin</allow_inactive>
<allow_active>auth_admin</allow_active>
</defaults>
- <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/mpan.pl</annotate>
+ <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/mpan</annotate>
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
</action>
</policyconfig>
diff --git a/scripts/mana b/scripts/mana
index 329f3b25..45acbfd3 100755
--- a/scripts/mana
+++ b/scripts/mana
@@ -51,7 +51,7 @@ my %modules = (
descr => "manahost: hosts manager",
},
pan => {
- exec => '/usr/bin/mpan.pl',
+ exec => '/usr/bin/mpan',
descr => "mpan: admin panel",
},
proxy => {
diff --git a/scripts/mpan.pl b/scripts/mpan
index 29b6d8e6..589a72e3 100755
--- a/scripts/mpan.pl
+++ b/scripts/mpan
@@ -41,9 +41,9 @@ else {
}
my $mainWin = new AdminPanel::MainDisplay();
while (1) {
- my $launch = $mainWin->start();
+ my $launch = $mainWin->start();
- if ($launch) {
+ if ($launch) {
$mainWin->destroy();
$launch->start();
}
@@ -57,12 +57,12 @@ while (1) {
sub usage {
print "\n";
- print "Usage mpan.pl [options...]\n\n";
+ print "Usage mpan [options...]\n\n";
print "Options:\n";
print "\t--help | -h print this help\n";
## anaselli: --name now is used only to add a path to /etc (e.g. --name mcc2 means /etc/mcc2)
# and it is overriden by --conf_dir, so it should be discussed better to understand
- # if it is really needed any more.
+ # if it is really needed any more.
# Window title is got from settings.conf (key title)
print "\t--name string specify the window title of the administration panel\n";
print "\t--conf_dir path specify the settings.conf file directory\n";
@@ -94,7 +94,7 @@ sub getSettings {
=pod
=head1 main
-
+
main launcher
=cut