From 00315eea58ab3c214886dfafdb879017b035e1fa Mon Sep 17 00:00:00 2001 From: Jeffery Wilson Date: Mon, 2 Oct 2023 20:03:13 -0400 Subject: [PATCH] Some fixes for Git Bash --- config/git/git-prompt.sh | 0 oh-my-zsh/dotfiles-custom/work.zsh | 2 +- zshrc | 10 ++++++---- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 config/git/git-prompt.sh diff --git a/config/git/git-prompt.sh b/config/git/git-prompt.sh new file mode 100644 index 0000000..e69de29 diff --git a/oh-my-zsh/dotfiles-custom/work.zsh b/oh-my-zsh/dotfiles-custom/work.zsh index c5eac3c..2d6dbd4 100644 --- a/oh-my-zsh/dotfiles-custom/work.zsh +++ b/oh-my-zsh/dotfiles-custom/work.zsh @@ -1,4 +1,4 @@ -if [ "$(uname -s)" != "Darwin" ]; then +if [ "$(uname -s)" = "Linux" ]; then export MEDIASOUP_ANNOUNCED_IP=$(hostname -I|cut -d' ' -f1) fi diff --git a/zshrc b/zshrc index 81cdcad..375e34b 100644 --- a/zshrc +++ b/zshrc @@ -106,11 +106,13 @@ else fi # fnm -export PATH=$HOME/.fnm:$PATH -if (( ! $+commands[fnm] )); then - curl -fsSL https://fnm.vercel.app/install | bash -s -- --skip-shell --install-dir "$HOME/.fnm" +if [[ "$MSYSTEM" != "MSYS" ]]; then + export PATH=$HOME/.fnm:$PATH + if (( ! $+commands[fnm] )); then + curl -fsSL https://fnm.vercel.app/install | bash -s -- --skip-shell --install-dir "$HOME/.fnm" + fi + eval "`fnm env --use-on-cd`" fi -eval "`fnm env --use-on-cd`" # nvm (for VS Code) export NVM_DIR="$HOME/.nvm"