From: Michael Prokop <mika@grml.org>
Date: Fri, 25 Nov 2022 08:48:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/github/pr/15'
X-Git-Tag: v2.12.0~1
X-Git-Url: http://git.grml.org/?p=grml-scripts.git;a=commitdiff_plain;h=10fcde779a5ff842a841a1a86390f1b903e00139;hp=c1231da0db59f3cb545d9ef8e446a287b7618a3c

Merge remote-tracking branch 'origin/github/pr/15'
---

diff --git a/usr_share/run-screen b/usr_share/run-screen
index 4832feb..d04543f 100755
--- a/usr_share/run-screen
+++ b/usr_share/run-screen
@@ -6,6 +6,7 @@
 # License:       This file is licensed under the GPL v2.
 ################################################################################
 
+export SHELL=/bin/zsh
 # try to mitigate raceconditions from screen
 SCREENDIR_="/var/run/screen"
 mkdir -m 700 "${SCREENDIR_}/S-$USER" >/dev/null 2>&1
@@ -13,11 +14,11 @@ mkdir -m 700 "${SCREENDIR_}/S-$USER" >/dev/null 2>&1
 # now run screen with config
 
   if [ "$(id -u)" = 0 ] ; then
-    exec screen -U -c /etc/grml/screenrc
+    exec screen -U -c /etc/grml/screenrc -s "-$SHELL"
   elif [ -r "$HOME/.screenrc" ] ; then
-    exec screen -U -c "$HOME/.screenrc"
+    exec screen -U -c "$HOME/.screenrc" -s "-$SHELL"
   else
-    exec screen -U -c /etc/grml/screenrc_generic
+    exec screen -U -c /etc/grml/screenrc_generic -s "-$SHELL"
   fi
 
 ## END OF FILE #################################################################
diff --git a/usr_share/run-welcome b/usr_share/run-welcome
index 265301e..d8d694a 100755
--- a/usr_share/run-welcome
+++ b/usr_share/run-welcome
@@ -9,6 +9,8 @@
 # shellcheck disable=SC1091
 . /etc/grml/sh-lib
 
+export SHELL=/bin/zsh
+
 [ -r /etc/grml_version ] && GRMLVERSION=$(cat /etc/grml_version) || GRMLVERSION='(no version information available)'
 PATH=$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/games:/home/grml/bin
 CMDLINE=$(cat /proc/cmdline)
@@ -82,6 +84,6 @@ Happy hacking!               http://grml.org/
 "
 fi
 
-exec /bin/zsh -l
+exec "$SHELL" -l
 
 ## END OF FILE #################################################################