From 7a27e1a4ad291725c3905f1e2e18d0fcaf7943c5 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Mon, 3 Oct 2016 01:01:01 +0200
Subject: [PATCH 10/21] add fish shell specific commands to Xsession and
 wayland-session to get the fish-specific login environment instead of the
 catchall /etc/profile environment.

---
 data/scripts/Xsession        | 6 ++++++
 data/scripts/wayland-session | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/data/scripts/Xsession b/data/scripts/Xsession
index 0c923a8..9dd3814 100755
--- 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
index efb1ec4..de4f519 100755
--- 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
-- 
2.10.2