Use echo on each line in migration message for activator switch in csh

equinor · Jan 26, 2024 · e487c83 · e487c83
1 parent aa960f1
commit e487c83
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/komodo/data/activator_switch.csh.tmpl b/komodo/data/activator_switch.csh.tmpl
@@ -31,7 +31,11 @@ else if ( `uname -r` =~ *el8* ) then
     setenv KOMODO_RELEASE $KOMODO_RELEASE_REAL
 {%- endif %}
 else if ( `uname -r` =~ *el6* ) then
-    echo -e "{{ migration_warning }}"
+{% filter indent(4, True) -%}
+{% for line in migration_warning.split('\n') -%}
+    echo "{{ line }}"
+{% endfor -%}
+{% endfilter -%}
 else
     echo "Attention! Your machine is running on an environment that is not supported."
 endif
diff --git a/tests/test_switch.py b/tests/test_switch.py
@@ -60,7 +60,9 @@ def test_write_activator_switches(tmpdir):
     endif
     setenv KOMODO_RELEASE $KOMODO_RELEASE_REAL
 else if ( `uname -r` =~ *el6* ) then
-    echo -e "{MIGRATION_WARNING}"
+    echo "Attention! Your machine is running on an environment that is not supported. RHEL6 has been phased out."
+    echo "From October 2020, komodo versions only support RHEL7."
+    echo "Please migrate as soon as possible. If you have any questions or issues - contact us on #ert-users on Slack or Equinor's Yammer."
 else
     echo "Attention! Your machine is running on an environment that is not supported."
 endif