Cardinal bugfix (#26)

* work outside of ()$ * works with el8 * work correctly on cardinal
OSC · Aug 19, 2024 · 4a49b95 · 4a49b95
1 parent b24d200
commit 4a49b95
Showing 1 changed file with 21 additions and 11 deletions.
diff --git a/template/script.sh.erb b/template/script.sh.erb
@@ -12,20 +12,30 @@ cd "${HOME}"
 # Launch Xfce Window Manager and Panel
 #
 
-(
-  export SEND_256_COLORS_TO_REMOTE=1
-  export XDG_CONFIG_HOME="<%= session.staged_root.join("config") %>"
-  export XDG_DATA_HOME="<%= session.staged_root.join("share") %>"
-  export XDG_CACHE_HOME="$(mktemp -d)"
-  export $(dbus-launch)
-
-  module restore
-  set -x
+
+
+export SEND_256_COLORS_TO_REMOTE=1
+export XDG_CONFIG_HOME="<%= session.staged_root.join("config") %>"
+export XDG_DATA_HOME="<%= session.staged_root.join("share") %>"
+export XDG_CACHE_HOME="$(mktemp -d)"
+export $(dbus-launch)
+
+module restore
+set -x
+
+source /etc/os-release
+
+if [[ "$VERSION_ID" < "9" ]]; then
   xfwm4 --compositor=off --daemon --sm-client-disable
   xsetroot -solid "#D3D3D3"
   xfsettingsd --sm-client-disable
-  xfce4-panel --sm-client-disable
-) &
+  xfce4-panel --sm-client-disable &
+else
+  xfwm4 --compositor=off --sm-client-disable &
+  xsetroot -solid "#D3D3D3"
+  xfsettingsd --sm-client-disable &
+  xfce4-panel --sm-client-disable &
+fi
 
 #
 # Start COMSOL Multiphysics