From d94c174da314b1318482a7d1977662c6480771e9 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Tue, 30 Jan 2024 17:05:20 -0500 Subject: [PATCH] Configured prompt for compatibility with older systems --- src/modules/bash/config/prompt.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/modules/bash/config/prompt.nix b/src/modules/bash/config/prompt.nix index 9e8b927..72114e6 100644 --- a/src/modules/bash/config/prompt.nix +++ b/src/modules/bash/config/prompt.nix @@ -47,30 +47,37 @@ set_git_dir() { working_dir="\[\033[01;34m\] $git_root_dir\[\033[00m\]" return 0 else - working_dir="\[\033[01;34m\] $git_root_dir/$git_curr_dir\[\033[00m\]" + working_dir="\[\033[01;34m\] $git_root_dir$git_curr_dir\[\033[00m\]" return 0 fi } +relative_path() { + local absolute_target=$(readlink -f "$1") + local absolute_base=$(readlink -f "$2") + echo "''${absolute_target#$absolute_base}" +} + check_project() { local git_dir=$(git rev-parse --git-dir 2>/dev/null) + if [ -n "$git_dir" ]; then local git_branch=$(git branch --show-current 2>/dev/null) - git_branch=''${git_branch:-$(git rev-parse --short HEAD)} + git_branch=''${git_branch:-$(git rev-parse --short HEAD 2>/dev/null)} local git_dir=$(git rev-parse --git-dir) - local git_root=$(dirname "$(realpath "$git_dir")") + local git_root=$(dirname "$(readlink -f "$git_dir")") - local git_curr_dir=$(realpath --relative-to="$git_root" .) + local git_curr_dir=$(relative_path "." "$git_root") local git_root_dir=$(basename "$git_root") git_branch_PS1="\[\033[01;31m\]$git_branch 󰘬:\[\033[00m\]" set_git_dir check_venv - fi - return 0 + return 0 + fi } function set_prompt() {