From 39c8b27c342442e585e0729982bdb82a95bc2e6c Mon Sep 17 00:00:00 2001
From: Guangxiong Lin <hi@gxlin.org>
Date: Thu, 16 Nov 2023 20:33:53 +0800
Subject: Refactor

---
 .bashrc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to '.bashrc')

diff --git a/.bashrc b/.bashrc
index a37d60f..b92a0f3 100644
--- a/.bashrc
+++ b/.bashrc
@@ -2,7 +2,7 @@
 # ~/.bashrc
 #
 
-[ "$(uname)" = Darwin ] && source "$HOME/.macos"
+source "$HOME/.macos"
 source "$HOME/.env"
 source "$HOME/.path"
 
@@ -17,11 +17,11 @@ source "$HOME/.fzfrc"
 [ -r "$HOME/.bash_local" ] && source "$HOME/.bash_local"
 
 if command -v fish > /dev/null; then
-    __FISH_IS_ACTIVE=${__FISH_IS_ACTIVE:-0}
-    if [[ -z ${BASH_EXECUTION_STRING} && $__FISH_IS_ACTIVE -eq 0 ]]
+    __FISH_IS_ACTIVE="$__FISH_IS_ACTIVE"
+    if [[ -z "$BASH_EXECUTION_STRING" && -z "$__FISH_IS_ACTIVE" ]]
     then
         shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=''
-        exec env __FISH_IS_ACTIVE=1 fish $LOGIN_OPTION
+        exec env __FISH_IS_ACTIVE=1 SHELL="$(which fish)" fish $LOGIN_OPTION
     fi
-    export __FISH_IS_ACTIVE=0
+    unset __FISH_IS_ACTIVE
 fi
-- 
cgit v1.2.3