From 186cc89e440017fc49907929105e0eb7ed31eaa9 Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Mon, 28 May 2007 21:53:13 +0000
Subject: * 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
---
 lib/OpenSLX/Basics.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/OpenSLX')

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) {
-- 
cgit v1.2.3-55-g7522