projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
[kivitendo-erp.git]
/
scripts
/
console
diff --git
a/scripts/console
b/scripts/console
index
79db5a9
..
78b7305
100755
(executable)
--- a/
scripts/console
+++ b/
scripts/console
@@
-9,16
+9,16
@@
BEGIN {
push @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version.
}
push @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version.
}
-use Config::Std;
use Data::Dumper;
use Devel::REPL 1.002001;
use Term::ReadLine::Perl::Bind; # use sane key binding for rxvt users
use Data::Dumper;
use Devel::REPL 1.002001;
use Term::ReadLine::Perl::Bind; # use sane key binding for rxvt users
-read_config 'config/lx_office.conf' => my %config;
+use SL::LxOfficeConf;
+SL::LxOfficeConf->read;
-my $login = shift || $
config{C
onsole}{login} || 'demo';
-my $history_file = $
config{C
onsole}{history_file} || '/tmp/lxoffice_console_history.log'; # fallback if users is not writable
-my $autorun = $
config{C
onsole}{autorun};
+my $login = shift || $
::lx_office_conf{c
onsole}{login} || 'demo';
+my $history_file = $
::lx_office_conf{c
onsole}{history_file} || '/tmp/lxoffice_console_history.log'; # fallback if users is not writable
+my $autorun = $
::lx_office_conf{c
onsole}{autorun};
# will be configed eventually
my @plugins = qw(History LexEnv Colors MultiLine::PPI FancyPrompt PermanentHistory AutoloadModules);
# will be configed eventually
my @plugins = qw(History LexEnv Colors MultiLine::PPI FancyPrompt PermanentHistory AutoloadModules);
@@
-41,7
+41,6
@@
use utf8;
use CGI qw( -no_xhtml);
use DateTime;
use SL::Auth;
use CGI qw( -no_xhtml);
use DateTime;
use SL::Auth;
-use SL::Dispatcher;
use SL::Form;
use SL::Helper::DateTime;
use SL::Locale;
use SL::Form;
use SL::Helper::DateTime;
use SL::Locale;
@@
-59,12
+58,6
@@
sub lxinit {
package main;
package main;
- eval { require "config/lx-erp.conf"; };
- eval { require "config/lx-erp-local.conf"; } if -f "config/lx-erp-local.conf";
-
- read_config 'config/lx_office.conf' => %::lx_office_conf;
- SL::Dispatcher::_decode_recursively(\%::lx_office_conf);
-
$::lxdebug = LXDebug->new;
$::locale = Locale->new($::lx_office_conf{system}->{language});
$::cgi = CGI->new qw();
$::lxdebug = LXDebug->new;
$::locale = Locale->new($::lx_office_conf{system}->{language});
$::cgi = CGI->new qw();