From e4586d5a07a4287276be855949d18c8533b8907b Mon Sep 17 00:00:00 2001
From: Goffi <goffi@goffi.org>
Date: Sun, 19 Jun 2011 17:40:36 +0200
Subject: [PATCH] launching script now read config files added ./sat.conf in
 possible config file location

---
 src/sat.sh          | 27 +++++++++++++++++++--------
 src/tools/memory.py |  2 +-
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/sat.sh b/src/sat.sh
index 51601b9f..1d30ed0a 100755
--- a/src/sat.sh
+++ b/src/sat.sh
@@ -16,14 +16,25 @@ fi
 
 NAME='sat'
 
-if [ -n "$SAT_CONST_local_dir" ];then
-	echo "Using overidded local dir: $SAT_CONST_local_dir"
-	PID_FILE="$SAT_CONST_local_dir/$NAME.pid"
-	LOG_FILE="$SAT_CONST_local_dir/$NAME.log"
-else
-	PID_FILE="/tmp/$NAME.pid"
-	LOG_FILE=~/".$NAME/$NAME.log"
-fi
+#We use python to parse config files
+eval `python<<PYTHONEND
+from ConfigParser import SafeConfigParser
+from os.path import expanduser, join
+
+config = SafeConfigParser(defaults={'local_dir':'~/.sat',
+									'pid_dir':'/tmp',
+									'log_dir':'%(local_dir)s'})
+try:
+	config.read(map(expanduser, ['/etc/sat.conf', '~/sat.conf', '~/.sat.conf', 'sat.conf', '.sat.conf']))
+except:
+	print ("Can't read main config !")
+print "LOCAL_DIR='%s'" % join(expanduser(config.get('DEFAULT', 'local_dir')),'')
+print "PID_DIR='%s'" % join(expanduser(config.get('DEFAULT', 'pid_dir')),'')
+print "LOG_DIR='%s'" % join(expanduser(config.get('DEFAULT', 'pid_dir')),'')
+PYTHONEND
+`
+PID_FILE="$PID_DIR$NAME.pid"
+LOG_FILE="$LOCAL_DIR$NAME.log"
 DAEMON="n"
 MAIN_OPTIONS="-${DAEMON}oy"
 TAP_PATH="./"
diff --git a/src/tools/memory.py b/src/tools/memory.py
index 1348289a..e863c2f4 100644
--- a/src/tools/memory.py
+++ b/src/tools/memory.py
@@ -410,7 +410,7 @@ class Memory:
         """look for main .ini configuration file, and parse it"""
         _config = SafeConfigParser(defaults=default_config)
         try:
-            _config.read(map(os.path.expanduser, ['/etc/sat.conf', '~/sat.conf', '~/.sat.conf', '.sat.conf']))
+            _config.read(map(os.path.expanduser, ['/etc/sat.conf', '~/sat.conf', '~/.sat.conf', 'sat.conf', '.sat.conf']))
         except:
             error (_("Can't read main config !"))