summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Tappe2007-07-22 11:29:49 +0200
committerOliver Tappe2007-07-22 11:29:49 +0200
commit1258e167d0c75473e50e840063db6d92eeaf0a80 (patch)
treea5e2bf67384e19d6e75a4f057f85161ae8aa385c
parent* first part of configuration file migration to Config::General (diff)
downloadcore-1258e167d0c75473e50e840063db6d92eeaf0a80.tar.gz
core-1258e167d0c75473e50e840063db6d92eeaf0a80.tar.xz
core-1258e167d0c75473e50e840063db6d92eeaf0a80.zip
* fixed compatibility problems of our config-files with regards to being
executed by shells: there is no whitespace allowed before or after the equal sign in shell-var assignments git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1269 95ad53e4-c205-0410-b2fa-d234c58c8868
-rwxr-xr-xbin/slxsettings5
-rw-r--r--lib/OpenSLX/Basics.pm5
2 files changed, 8 insertions, 2 deletions
diff --git a/bin/slxsettings b/bin/slxsettings
index be318bb5..976640ee 100755
--- a/bin/slxsettings
+++ b/bin/slxsettings
@@ -90,7 +90,10 @@ while (scalar @ARGV) {
# fetch current content of local settings file...
my $fileName = "$openslxConfig{'config-path'}/settings";
my $configObj = Config::General->new(
- -ConfigFile => $fileName, -SplitPolicy => 'equalsign',
+ -ConfigFile => $fileName,
+ -SplitDelimiter => '\s*=\s*',
+ -SplitPolicy => 'custom',
+ -StoreDelimiter => '=',
);
my %settings = $configObj->getall();
diff --git a/lib/OpenSLX/Basics.pm b/lib/OpenSLX/Basics.pm
index fb7db676..3aebb54e 100644
--- a/lib/OpenSLX/Basics.pm
+++ b/lib/OpenSLX/Basics.pm
@@ -170,7 +170,10 @@ sub openslxInit
vlog(0, "reading config-file $f...");
}
my %config = ParseConfig(
- -ConfigFile => $f, -AutoTrue => 1, -LowerCaseNames => 1
+ -AutoTrue => 1,
+ -ConfigFile => $f,
+ -LowerCaseNames => 1,
+ -SplitPolicy => 'equalsign',
);
foreach my $key (keys %config) {
# N.B.: these config files are used by shell-scripts, too, so in