From 046a6badc980e0dbb223befef15dfccf031761c3 Mon Sep 17 00:00:00 2001
From: Marcus Stoegbauer <lysis@lys.is>
Date: Mon, 14 Jan 2013 15:06:52 +0000
Subject: [PATCH] Config-File installieren, default auf ~/etc/userconfig.cfg
 wenn nicht mit -c ueberschrieben

---
 setup.py       | 3 ++-
 userconfig.cfg | 9 +++++++++
 userconfig.py  | 4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 userconfig.cfg

diff --git a/setup.py b/setup.py
index 4f009db..ac13c4b 100755
--- a/setup.py
+++ b/setup.py
@@ -12,5 +12,6 @@ setup(	name="userconfig",
 	author="Marcus Stoegbauer",
 	author_email="marcus@grmpf.org",
 	packages=["Userconfig"],
-	scripts = ["userconfig.py"]
+	scripts = ["userconfig.py"],
+	data_files = [ ('etc', [ 'userconfig.cfg' ]) ]
     )
diff --git a/userconfig.cfg b/userconfig.cfg
new file mode 100644
index 0000000..84e25bc
--- /dev/null
+++ b/userconfig.cfg
@@ -0,0 +1,9 @@
+# $Id$
+# $URL$
+
+[Main]
+configdir = ../
+configfile = userconfig.cfg
+debug = 0
+stamp = %userconfig_generated 1.0%
+stampreplace = $userconfig_stamp$
diff --git a/userconfig.py b/userconfig.py
index 40fa0cd..bd8293b 100755
--- a/userconfig.py
+++ b/userconfig.py
@@ -195,7 +195,7 @@ def processAllFiles(destfiles, dirConfig):
 # def buildAllFiles
 
 def main():
-  configfile = ""
+  configfile = os.environ['HOME']+"/etc/userconfig.cfg"
   global verbose
   
   try:
@@ -222,7 +222,7 @@ def main():
     return 2
   # try
   
-  if configfile == "":
+  if not os.path.isfile(configfile):
     Tools.error( "No config file specified.")
     return 2
   # if configfile