Merge pull request #107 from YetAnotherPackageInstaller/patch.config.dir

Patch.config.dir
Wabri · Feb 17, 2019 · 3bda0ae · 3bda0ae
2 parents ec76fad + 0bc2d37
commit 3bda0ae
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/config.ini → config/config.ini b/config.ini → config/config.ini
@@ -3,7 +3,7 @@ yapi_dir =
 platform =
 file_extension = .sh
 language = en
-language_dir = ${yapi_dir}/modules/languages/pack
+language_dir = ${yapi_dir}/config/languages
 
 [INSTALL]
 soft_link = /usr/local/bin

diff --git a/modules/languages/pack/en.ini → config/languages/en.ini b/modules/languages/pack/en.ini → config/languages/en.ini
diff --git a/modules/languages/pack/it.ini → config/languages/it.ini b/modules/languages/pack/it.ini → config/languages/it.ini
diff --git a/install.py b/install.py
@@ -6,8 +6,8 @@
 import sys
 
 config = ConfigParser(interpolation=ExtendedInterpolation())
-real_config_path = os.path.realpath(
-    __file__).rstrip("install.py") + "config.ini"
+real_path = os.path.realpath(__file__)
+real_config_path = real_path.rstrip("install.py") + "config/config.ini"
 config.read(real_config_path)
 
 yapi_real_path = os.path.realpath(__file__).rstrip("/install.py")

diff --git a/modules/configuration/config_extractor.py b/modules/configuration/config_extractor.py
@@ -6,7 +6,7 @@ def get_configuration():
     from os import path
     config = ConfigParser(interpolation=ExtendedInterpolation())
     config.read(path.realpath(__file__).rstrip(
-        "modules/configuration/config_extractor.py") + "/config.ini")
+        "modules/configuration/config_extractor.py") + "/config/config.ini")
     configuration = dict()
     for key in config.keys():
         configuration[key] = dict()

diff --git a/modules/languages/language_pack_manager.py b/modules/languages/language_pack_manager.py
@@ -3,8 +3,9 @@ def get_language_pack():
     from configparser import ConfigParser
     from modules.configuration.config_extractor import get_configuration
     config = get_configuration()
-    language_config_file = str(config["COMMON"]["language_dir"]) + "/" + \
-        config["COMMON"]["language"] + ".ini"
+    language_dir = str(config["COMMON"]["language_dir"])
+    language_name = str(config["COMMON"]["language"])
+    language_config_file = language_dir + "/" + language_name + ".ini"
     language_config = ConfigParser()
     language_config.read(language_config_file)
     language_pack = dict()