diff options
| -rw-r--r-- | extras/conf/settings.conf | 2 | ||||
| -rw-r--r-- | lib/AdminPanel/MainDisplay.pm | 4 | ||||
| -rwxr-xr-x | scripts/apanel.pl | 12 |
3 files changed, 12 insertions, 6 deletions
diff --git a/extras/conf/settings.conf b/extras/conf/settings.conf index 000a9fe5..95a206bf 100644 --- a/extras/conf/settings.conf +++ b/extras/conf/settings.conf @@ -1,6 +1,6 @@ <?xml version='1.0'?> <settings> - <title>Admin Panel</title> + <title>Mageia Panel</title> <!--logo>images/logo_mageia.png</logo> <icon>images/mageia.png</icon> <log>/tmp/apanel.log</log--> diff --git a/lib/AdminPanel/MainDisplay.pm b/lib/AdminPanel/MainDisplay.pm index 73938ab3..cee69bc5 100644 --- a/lib/AdminPanel/MainDisplay.pm +++ b/lib/AdminPanel/MainDisplay.pm @@ -141,8 +141,8 @@ sub new { ## Default values $self->{name} = "Administration panel"; $self->{categories} = []; - $self->{confDir} = "/etc/apanel", - $self->{title} = "apanel", + $self->{confDir} = "/etc/mpan", + $self->{title} = "mpan", my $cmdline = new yui::YCommandLine; diff --git a/scripts/apanel.pl b/scripts/apanel.pl index 813c1701..75606e60 100755 --- a/scripts/apanel.pl +++ b/scripts/apanel.pl @@ -75,13 +75,19 @@ sub usage { # adpanel settings sub getSettings { my ($self) = @_; + + my $confDir = "/etc/mpan"; # yui commandline parser my $pos = $cmdline->find("--conf_dir"); - my $confDir = "/etc/apanel"; if($pos > 0){ $confDir = $cmdline->arg($pos + 1); - }else{ - $confDir = "/etc/apanel"; + } + else { + $pos = $cmdline->find("--name"); + if ($pos > 0) + { + $confDir = "/etc/" . $cmdline->arg($pos+1); + } } # configuration file name my $fileName = "$confDir/settings.conf"; |