Merge pull request #713 from florianjacob/fish-login-environment

add fish shell specific commands to Xsession and wayland-session
sddm · Oct 10, 2016 · 0ef0df7 · 0ef0df7
2 parents 551ed80 + 7a27e1a
commit 0ef0df7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/data/scripts/Xsession b/data/scripts/Xsession
@@ -38,6 +38,12 @@ case $SHELL in
     . $xsess_tmp
     rm -f $xsess_tmp
     ;;
+  */fish)
+    xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
+    $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp"
+    . $xsess_tmp
+    rm -f $xsess_tmp
+    ;;
   *) # Plain sh, ksh, and anything we do not know.
     [ -f /etc/profile ] && . /etc/profile
     [ -f $HOME/.profile ] && . $HOME/.profile

diff --git a/data/scripts/wayland-session b/data/scripts/wayland-session
@@ -38,6 +38,12 @@ case $SHELL in
     . $wlsess_tmp
     rm -f $wlsess_tmp
     ;;
+  */fish)
+    xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
+    $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp"
+    . $xsess_tmp
+    rm -f $xsess_tmp
+    ;;
   *) # Plain sh, ksh, and anything we do not know.
     [ -f /etc/profile ] && . /etc/profile
     [ -f $HOME/.profile ] && . $HOME/.profile