fix(get_nvim): use current commit when the repo is in detach HEAD

mike325 · Jan 24, 2024 · 12290c0 · 12290c0
1 parent 27cb6ff
commit 12290c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/bin/get_nvim.sh b/bin/get_nvim.sh
@@ -554,6 +554,10 @@ make clean
 BUILD_TYPE="Release"
 
 current_branch="$(git branch --show-current)"
+if [[ -z "$current_branch" ]]; then
+    current_branch="$(git rev-parse HEAD)"
+fi
+
 if [[ $STABLE -eq 1 ]]; then
     BRANCH="${BRANCH:-$(git tag | sort -h | tail -1)}"
 elif [[ $DEV -eq 1 ]]; then
@@ -563,7 +567,7 @@ else
     BRANCH="$current_branch"
 fi
 
-if [[ $BRANCH != "$current_branch"     ]]; then
+if [[ $BRANCH != "$current_branch" ]]; then
     status_msg "Checking out to $BRANCH"
     git checkout "$BRANCH"
 fi

diff --git a/shell/alias/alias.sh b/shell/alias/alias.sh
@@ -83,6 +83,8 @@ if hash nvim 2>/dev/null; then
     alias bim="nvim"
     alias cim="nvim"
     alias im="nvim"
+
+    # shellcheck disable=SC2016
     export MANPAGER='nvim --clean --cmd "set fileencoding=utf-8" -u "$HOME/.config/nvim/man.lua" +Man!'
     # export MANPAGER='nvim --cmd "let g:minimal=v:true" +Man!'