diff options
| author | Oliver Tappe | 2007-05-28 23:53:13 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2007-05-28 23:53:13 +0200 |
| commit | 186cc89e440017fc49907929105e0eb7ed31eaa9 (patch) | |
| tree | 18040459f9bf1f85991673b4817384c8fb17aa85 /lib/OpenSLX | |
| parent | * added support for 'local:'-URLs, which trigger the automatic start of a (diff) | |
| download | core-186cc89e440017fc49907929105e0eb7ed31eaa9.tar.gz core-186cc89e440017fc49907929105e0eb7ed31eaa9.tar.xz core-186cc89e440017fc49907929105e0eb7ed31eaa9.zip | |
* part one of settings file related changes (ticket#122):
- 'settings.default' now lives in /opt/openslx/share
- 'settings.local' has been renamed to 'settings'
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1103 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'lib/OpenSLX')
| -rw-r--r-- | lib/OpenSLX/Basics.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/OpenSLX/Basics.pm b/lib/OpenSLX/Basics.pm index f673d279..fad4903a 100644 --- a/lib/OpenSLX/Basics.pm +++ b/lib/OpenSLX/Basics.pm @@ -164,8 +164,10 @@ sub openslxInit # try to read and evaluate config files: my $configPath = $cmdlineConfig{'config-path'} || $openslxConfig{'config-path'}; - foreach my $f ("$configPath/settings.default", - "$configPath/settings.local", + my $sharePath = $cmdlineConfig{'share-path'} + || $openslxConfig{'share-path'}; + foreach my $f ("$sharePath/settings.default", + "$configPath/settings", "$ENV{HOME}/.openslx/settings") { next unless open(CONFIG, "<$f"); if ($cmdlineConfig{'verbose-level'} >= 2) { |