diff --git a/_tools/get_started.py b/_tools/get_started.py index 15abfadef7..3a1cc61021 100755 --- a/_tools/get_started.py +++ b/_tools/get_started.py @@ -6,7 +6,7 @@ import os from lib.network import download from lib.logging import log -from lib.constants import tools_cache, tools_cache_kolibri_img +from lib.constants import tools, tools_workspace, tools_cache, tools_cache_kolibri_img def generate_script_executing_script(script_to_execute): script_to_execute = script_to_execute.replace("\\", "\\\\") @@ -25,9 +25,8 @@ def create_workspace_script(name, script_to_execute): log("Done") if __name__ == "__main__": - tools_get_started_py = os.path.abspath(__file__) - tools = os.sep.join(tools_get_started_py.split(os.sep)[:-1]) - tools_workspace = os.sep.join([tools, "workspace"]) + # Create _tools/cache folder if not exist + os.makedirs(tools_cache, exist_ok = True) # Create (in current directory) scripts that execute # the same named scripts from _tools/workspace tools_workspace_run_py = os.path.join(tools_workspace, "run.py") @@ -38,6 +37,5 @@ if __name__ == "__main__": # TODO: Do anything if tup doesn't exist os.system("tup init") # Download IMG to _tools/cache - os.makedirs(tools_cache, exist_ok = True) img_url = "http://builds.kolibrios.org/eng/data/data/kolibri.img" download(img_url, tools_cache_kolibri_img, skip_exist = True) diff --git a/_tools/lib/constants.py b/_tools/lib/constants.py index 5f9e40b721..7e560b1dfd 100644 --- a/_tools/lib/constants.py +++ b/_tools/lib/constants.py @@ -1,8 +1,22 @@ import os +### PATHS + +# _tools/lib/constants.py tools_lib_constants_py = os.path.abspath(__file__) + +# _tools/lib tools_lib = os.path.dirname(tools_lib_constants_py) + +# _tools tools = os.path.dirname(tools_lib) + +# _tools/workspace +tools_workspace = os.path.join(tools, "workspace") + +# _tools/cache tools_cache = os.path.join(tools, "cache") + +# _tools/cache/kolibri.img tools_cache_kolibri_img = os.path.join(tools_cache, "kolibri.img")