From ba39e76c05fab565c7eeaae6f6c2cb9aa5b88ea3 Mon Sep 17 00:00:00 2001
From: MaZderMind <git@mazdermind.de>
Date: Wed, 27 Apr 2016 21:13:10 +0200
Subject: deprecate /etc/voctomix.ini, replaced with /etc/voctocore.ini

---
 voctocore/README.md     | 4 ++--
 voctocore/lib/config.py | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'voctocore')

diff --git a/voctocore/README.md b/voctocore/README.md
index 2d691f5..d3be701 100644
--- a/voctocore/README.md
+++ b/voctocore/README.md
@@ -147,8 +147,8 @@ They can be used to Implement Features like a "Cut-Button" in the GUI. When Clic
 On Startup the Video-Mixer reads the following Configuration-Files:
  - `<install-dir>/default-config.ini`
  - `<install-dir>/config.ini`
- - `/etc/voctomix.ini`
- - `<homedir>/.voctomix.ini`
+ - `/etc/voctocore.ini`
+ - `<homedir>/.voctocore.ini`
  - `<File specified on Command-Line via --ini-file>`
 
 From top to bottom the individual Settings override previous Settings. `default-config.ini` should not be edited, because a missing Setting will result in an Exception.
diff --git a/voctocore/lib/config.py b/voctocore/lib/config.py
index ebb9e1e..4567acf 100644
--- a/voctocore/lib/config.py
+++ b/voctocore/lib/config.py
@@ -12,8 +12,10 @@ SafeConfigParser.getlist = getlist
 files = [
 	os.path.join(os.path.dirname(os.path.realpath(__file__)), '../default-config.ini'),
 	os.path.join(os.path.dirname(os.path.realpath(__file__)), '../config.ini'),
-	'/etc/voctomix.ini',
-	os.path.expanduser('~/.voctomix.ini'),
+	'/etc/voctomix.ini', # deprecated
+	'/etc/voctocore.ini',
+	os.path.expanduser('~/.voctomix.ini'), # deprecated
+	os.path.expanduser('~/.voctocore.ini'),
 ]
 
 if Args.ini_file is not None:
-- 
cgit v1.2.3