refactor

install-mpsd-software-environment.py

@@ -28,15 +28,17 @@ class os_chdir:
 
 
 class builder():
-    def __init__(self,toolchain_list,target_dir,skip_build_cache,skip_dir_check,release,cmd,remove) -> None:
+    def __init__(self,toolchain_list,target_dir,skip_build_cache,release,cmd,remove) -> None:
         # Variables taken from cli arguments
         self.toolchain_list = toolchain_list
-        self.toolchain_base_dir = target_dir
-        self.skip_build_cache = skip_build_cache
-        self.skip_dir_check = skip_dir_check
-        self.mpsd_spack_ver = release
         self.mpsd_os = os.environ["MPSD_OS"]
         self.mpsd_microarch = os.environ["MPSD_MICROARCH"]
+        self.mpsd_spack_ver = release
+        if target_dir == "DEFAULT":
+            target_dir = f"/opt_mpsd/{self.mpsd_os}/{self.mpsd_spack_ver}/{self.mpsd_microarch}"
+        self.toolchain_base_dir = target_dir
+        self.skip_build_cache = skip_build_cache
+        self.skip_dir_check = False
         self.current_dir = os.getcwd()
         self.run_mode = cmd
         # Spack environments related variables
@@ -60,7 +62,7 @@ class builder():
         elif self.run_mode == 'install':
             self.build_toolchains()
         else:
-            self.prepare_env()
+            self.prepare_env(self.toolchain_base_dir,skip_dir_check=)
 
     def build_toolchains(
         mpsd_spack_ver=None,
@@ -146,8 +148,6 @@ class builder():
 
 
     def prepare_env(release, target_dir, skip_dir_check):
-        if target_dir == "DEFAULT":
-            target_dir = f"/opt_mpsd/{os.environ['MPSD_OS']}/{release}/{os.environ['MPSD_MICROARCH']}"
         if not os.path.exists(target_dir):
             os.makedirs(target_dir)
         else: