From 14e9d81a99a7ce2a1d75674c196499f264f5afaa Mon Sep 17 00:00:00 2001
From: "Yngve S. Kristiansen" <ynk@equinor.com>
Date: Tue, 15 Oct 2024 09:49:07 +0200
Subject: [PATCH] Use only one fm shell script list

---
 src/everest/bin/utils.py     |  8 ++++++--
 src/everest/jobs/__init__.py | 14 --------------
 src/everest/suite.py         |  4 ++--
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/everest/bin/utils.py b/src/everest/bin/utils.py
index bdce715a78e..445d5ac2489 100644
--- a/src/everest/bin/utils.py
+++ b/src/everest/bin/utils.py
@@ -9,6 +9,7 @@
 import colorama
 from colorama import Fore
 
+from ert.resources.shell_scripts import all_shell_script_fm_steps
 from ert.simulator.batch_simulator_context import Status
 from everest.config import EverestConfig
 from everest.detached import (
@@ -20,7 +21,6 @@
     start_monitor,
 )
 from everest.export import export
-from everest.jobs import shell_commands
 from everest.simulator import JOB_FAILURE, JOB_RUNNING, JOB_SUCCESS
 from everest.strings import EVEREST
 
@@ -269,7 +269,11 @@ def _get_jobs_status(progress):
     def _filter_jobs(self, progress):
         if not self._show_all_jobs:
             progress = [
-                [job for job in progress_list if job["name"] not in shell_commands]
+                [
+                    job
+                    for job in progress_list
+                    if job["name"] not in all_shell_script_fm_steps
+                ]
                 for progress_list in progress
             ]
         return progress
diff --git a/src/everest/jobs/__init__.py b/src/everest/jobs/__init__.py
index df475dafb94..4097323e3f4 100644
--- a/src/everest/jobs/__init__.py
+++ b/src/everest/jobs/__init__.py
@@ -50,17 +50,3 @@ def fetch_script(script_name):
 
 
 _inject_scripts()
-
-# Note: Must be kept in sync with shell scripts on ERT-side
-# (which is also not expected to change frequently/drastically)
-shell_commands = (
-    "careful_copy_file",
-    "copy_directory",
-    "copy_file",
-    "delete_directory",
-    "delete_file",
-    "make_directory",
-    "make_symlink",
-    "move_file",
-    "symlink",
-)
diff --git a/src/everest/suite.py b/src/everest/suite.py
index e320af75760..ae39d245343 100644
--- a/src/everest/suite.py
+++ b/src/everest/suite.py
@@ -18,7 +18,7 @@
 from ropt.plan import OptimizationPlanRunner
 from seba_sqlite import SqliteStorage
 
-import everest
+from ert.resources.shell_scripts import all_shell_script_fm_steps
 from everest.config import EverestConfig
 from everest.optimizer.everest2ropt import everest2ropt
 from everest.plugins.site_config_env import PluginSiteConfigEnv
@@ -217,7 +217,7 @@ def extract(path_str, key):
                 for fms in progress_queue.steps:
                     if (
                         not self._display_all_jobs
-                        and fms.name in everest.jobs.shell_commands
+                        and fms.name in all_shell_script_fm_steps
                     ):
                         continue
                     realization = extract(fms.std_out_file, "geo_realization")