Remove cmd

src/mpsd_software_manager/mpsd_software.py

@@ -1082,7 +1082,7 @@ def remove_environment(mpsd_release, root_dir, package_sets="NONE", force_remove
     """Remove release from installation.
 
     Handle 3 situations :
-    1. remove dosent specify what to remove
+    1. remove does not specify what to remove
         -> warn and exit
     2. remove all package_sets from release
         -> remove release folder except logs
@@ -1097,7 +1097,7 @@ def remove_environment(mpsd_release, root_dir, package_sets="NONE", force_remove
         A Path object representing the path to the directory where
         the release and package_sets will be installed.
     package_sets : list of str
-        A list of strings representing the package_sets to install
+        A list of strings representing the package_sets to remove
         (e.g., "foss2021a-mpi", "global_generic", "ALL").
     force_remove : bool, optional
         A boolean indicating whether to force remove the release.
@@ -1138,13 +1138,10 @@ def remove_environment(mpsd_release, root_dir, package_sets="NONE", force_remove
 
         logging.info(f"> Logging removal of {mpsd_release} at {build_log_path}")
         folders_to_remove = os.listdir(dir_to_remove)
-        # skip logs folder
-        # if "logs" in folders_to_remove:
-        #     folders_to_remove.remove("logs")
         for folder in folders_to_remove:
             # shutil.rmtree(dir_to_remove / folder) #dosent delete file
             run(
-                f"rm -rf {dir_to_remove / folder} 2>&1 | tee {build_log_path}",
+                f"rm -rf {dir_to_remove / folder} 2>&1 | tee -a {build_log_path}",
                 shell=True,
                 check=True,
             )
@@ -1190,6 +1187,7 @@ def remove_spack_environment(spack_dir, environment_name, build_log_path=None):
     then uninstall all packages exclusive to the environment,
     then deactivate the environment,
     and finally remove the environment.
+
     Parameters
     ----------
     spack_dir : pathlib.Path
@@ -1202,7 +1200,7 @@ def remove_spack_environment(spack_dir, environment_name, build_log_path=None):
     logging.warning(f"Removing spack environment {environment_name}")
     spack_env = spack_dir / "share" / "spack" / "setup-env.sh"
     commands_to_execute = [
-        f"export SPACK_DIR={spack_dir}",  # need to set SPACK_DIR in dash and sh
+        f"export SPACK_ROOT={spack_dir}",  # need to set SPACK_ROOT in dash and sh
         f". {spack_env}",
         f"spack env activate {environment_name}",
         f"for spec in $(spack -e {environment_name} find"  # this line continues
@@ -1213,7 +1211,7 @@ def remove_spack_environment(spack_dir, environment_name, build_log_path=None):
     ]
     build_log_path = build_log_path or "/dev/null"
     run(
-        " && ".join(commands_to_execute) + f" 2>&1 |tee {build_log_path}",
+        "(" + " && ".join(commands_to_execute) + f") 2>&1 |tee -a {build_log_path}",
         shell=True,
         check=True,
     )
@@ -1237,12 +1235,12 @@ def remove_spack_package(spack_dir, package, build_log_path=None):
     logging.info(f"Removing spack package {package}")
     spack_env = spack_dir / "share" / "spack" / "setup-env.sh"
     commands_to_execute = [
-        f"export SPACK_DIR={spack_dir}",  # need to set SPACK_DIR in dash and sh
+        f"export SPACK_ROOT={spack_dir}",  # need to set SPACK_ROOT in dash and sh
         f". {spack_env}",
         f"spack uninstall -y {package}",
     ]
     run(
-        " && ".join(commands_to_execute) + f" 2>&1 |tee {build_log_path}",
+        "(" + " && ".join(commands_to_execute) + f") 2>&1 |tee -a {build_log_path}",
         shell=True,
         check=True,
     )