Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksey Lim <alsroot@member.fsf.org>2009-03-04 15:43:23 (GMT)
committer Aleksey Lim <alsroot@member.fsf.org>2009-03-04 15:43:23 (GMT)
commit656a061d12a3d257d569804dd10275783bfcc733 (patch)
tree1d9950389bb101c0869772eed1695ee95fe307f3
parent7e801c32bc1356ba490b32df558d3d2c0f7f6ced (diff)
Adapt Config.py to aslo installation
-rw-r--r--common/Config.py19
1 files changed, 6 insertions, 13 deletions
diff --git a/common/Config.py b/common/Config.py
index d381370..76ba7eb 100644
--- a/common/Config.py
+++ b/common/Config.py
@@ -8,7 +8,7 @@ import logging
FEATURES_OGG = None
FEATURES_MIC = None
-FEATURES_LAB = True
+FEATURES_LAB = None
FEATURES_NEWSOUNDS = None
FEATURES_GRAB_MOUSE = None
@@ -31,18 +31,11 @@ TMP_DIR = os.path.join(get_activity_root(), 'tmp')
logging.debug('INFO: loaded TAMTAM_ROOT=%s' % TAM_TAM_ROOT)
-if os.path.exists('/ofw'): # XO
- DATA_DIR = os.path.join(get_activity_root(), 'data')
- SNDS_INFO_DIR = os.path.join(get_activity_root(), 'data', 'snds_info')
- FILES_DIR = os.path.join(TAM_TAM_ROOT, "..", "TamTamEdit.activity", "common", "Resources")
- SOUNDS_DIR = os.path.join(FILES_DIR, "Sounds", "")
- IMAGE_ROOT = os.path.join(FILES_DIR, "Images", "")
-else:
- DATA_DIR = os.path.join(os.getenv('HOME'), '.tamtam')
- SNDS_INFO_DIR = os.path.join(os.getenv('HOME'), '.tamtam', 'snds_info')
- FILES_DIR = "/usr/share/tamtam/"
- SOUNDS_DIR = "/usr/share/tamtam/Sounds/"
- IMAGE_ROOT = '/usr/share/tamtam/Images/'
+DATA_DIR = os.path.join(get_activity_root(), 'data')
+SNDS_INFO_DIR = os.path.join(get_activity_root(), 'data', 'snds_info')
+FILES_DIR = os.path.join(TAM_TAM_ROOT, "..", "TamTamEdit.activity", "common", "Resources")
+SOUNDS_DIR = os.path.join(FILES_DIR, "Sounds", "")
+IMAGE_ROOT = os.path.join(FILES_DIR, "Images", "")
for i in (INSTANCE_DIR, DATA_DIR, SNDS_INFO_DIR, TMP_DIR):
if not os.path.isdir(i): os.makedirs(i)