From af4294c480903c8fb7d164c45b87995c5cc94475 Mon Sep 17 00:00:00 2001 From: 1ridic Date: Mon, 11 Sep 2023 23:55:51 +0800 Subject: [PATCH 1/2] [menuconfig] Add env file for fish Using env.sh in fish shell will cause problems. Creating a new env.fish for it. --- tools/menuconfig.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/menuconfig.py b/tools/menuconfig.py index aaf4c9e888d..94aeaa21435 100644 --- a/tools/menuconfig.py +++ b/tools/menuconfig.py @@ -219,6 +219,9 @@ def touch_env(): if sys.platform != 'win32': env_sh = open(os.path.join(env_dir, 'env.sh'), 'w') env_sh.write('export PATH=~/.env/tools/scripts:$PATH') + + env_fish = open(os.path.join(env_dir, 'env.fish'), 'w') + env_fish.write('set -gx PATH ~/.env/tools/scripts $PATH') else: if os.path.exists(os.path.join(env_dir, 'tools', 'scripts')): os.environ["PATH"] = os.path.join(env_dir, 'tools', 'scripts') + ';' + os.environ["PATH"] From 72a4317c462a7d94934d0159c45058a56cd38989 Mon Sep 17 00:00:00 2001 From: 1ridic Date: Thu, 14 Sep 2023 12:37:23 +0800 Subject: [PATCH 2/2] [menuconfig] Generate env.fish if fish config exists --- tools/menuconfig.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/menuconfig.py b/tools/menuconfig.py index 94aeaa21435..678f23bf038 100644 --- a/tools/menuconfig.py +++ b/tools/menuconfig.py @@ -220,8 +220,10 @@ def touch_env(): env_sh = open(os.path.join(env_dir, 'env.sh'), 'w') env_sh.write('export PATH=~/.env/tools/scripts:$PATH') - env_fish = open(os.path.join(env_dir, 'env.fish'), 'w') - env_fish.write('set -gx PATH ~/.env/tools/scripts $PATH') + # if fish config exists, generate env.fish + if os.path.exists(os.path.join(home_dir, '.config', 'fish', 'config.fish')): + env_fish = open(os.path.join(env_dir, 'env.fish'), 'w') + env_fish.write('set -gx PATH ~/.env/tools/scripts $PATH') else: if os.path.exists(os.path.join(env_dir, 'tools', 'scripts')): os.environ["PATH"] = os.path.join(env_dir, 'tools', 'scripts') + ';' + os.environ["PATH"]