1 files changed, 14 insertions, 10 deletions
diff --git a/module/InitHomeDir.py b/module/InitHomeDir.py
index 156c9f932..ccf525576 100644
--- a/module/InitHomeDir.py
+++ b/module/InitHomeDir.py
@@ -25,6 +25,7 @@ import sys
 from sys import argv, platform
 
 import __builtin__
+
 __builtin__.owd = path.abspath("") #original working directory
 __builtin__.pypath = path.abspath(path.join(__file__, "..", ".."))
 
@@ -52,24 +53,27 @@ else:
 
 __builtin__.homedir = homedir
 
-args = " ".join(argv[1:])
-
+configdir = None
+args = " ".join(argv)
 # dirty method to set configdir from commandline arguments
 if "--configdir=" in args:
-    pos = args.find("--configdir=")
-    end = args.find("-", pos + 12)
+    for arg in argv:
+        if arg.startswith("--configdir="):
+            configdir = arg.replace('--configdir=', '').strip()
+
+elif "nosetests" in args:
+    print "Running in test mode"
+    configdir = join(pypath, "tests", "config")
 
-    if end == -1:
-        configdir = args[pos + 12:].strip()
-    else:
-        configdir = args[pos + 12:end].strip()
 elif path.exists(path.join(pypath, "module", "config", "configdir")):
     f = open(path.join(pypath, "module", "config", "configdir"), "rb")
     c = f.read().strip()
     f.close()
     configdir = path.join(pypath, c)
-else:
-    if platform in ("posix", "linux2"):
+
+# default config dir
+if not configdir:
+    if platform in ("posix", "linux2", "darwin"):
         configdir = path.join(homedir, ".pyload")
     else:
         configdir = path.join(homedir, "pyload")