From fd51b4b6170badd8713047d11066cc9b1db028de Mon Sep 17 00:00:00 2001 From: oGre Date: Wed, 20 Jul 2016 23:29:27 +0200 Subject: [PATCH 1/2] Make sure aliases for cp and rm are lower priority than the original command --- gitprompt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitprompt.sh b/gitprompt.sh index 720a584..be97d31 100755 --- a/gitprompt.sh +++ b/gitprompt.sh @@ -447,7 +447,7 @@ function createPrivateIndex { __GIT_INDEX_FILE="$GIT_INDEX_FILE" fi __GIT_INDEX_PRIVATE="/tmp/git-index-private$$" - cp "$__GIT_INDEX_FILE" "$__GIT_INDEX_PRIVATE" 2>/dev/null + \cp "$__GIT_INDEX_FILE" "$__GIT_INDEX_PRIVATE" 2>/dev/null echo "$__GIT_INDEX_PRIVATE" } @@ -547,7 +547,7 @@ function updatePrompt() { fi PS1="${NEW_PROMPT//_LAST_COMMAND_INDICATOR_/${LAST_COMMAND_INDICATOR}${ResetColor}}" - rm "$GIT_INDEX_PRIVATE" 2>/dev/null + \rm -f "$GIT_INDEX_PRIVATE" 2>/dev/null } # Helper function that returns virtual env information to be set in prompt From 9014f4ae1db1689202b1853a857b5aedf3785598 Mon Sep 17 00:00:00 2001 From: oGre Date: Thu, 21 Jul 2016 07:48:22 +0200 Subject: [PATCH 2/2] Use keyword command inestead of backslash and remove -f flag on rm --- gitprompt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitprompt.sh b/gitprompt.sh index be97d31..492cd93 100755 --- a/gitprompt.sh +++ b/gitprompt.sh @@ -447,7 +447,7 @@ function createPrivateIndex { __GIT_INDEX_FILE="$GIT_INDEX_FILE" fi __GIT_INDEX_PRIVATE="/tmp/git-index-private$$" - \cp "$__GIT_INDEX_FILE" "$__GIT_INDEX_PRIVATE" 2>/dev/null + command cp "$__GIT_INDEX_FILE" "$__GIT_INDEX_PRIVATE" 2>/dev/null echo "$__GIT_INDEX_PRIVATE" } @@ -547,7 +547,7 @@ function updatePrompt() { fi PS1="${NEW_PROMPT//_LAST_COMMAND_INDICATOR_/${LAST_COMMAND_INDICATOR}${ResetColor}}" - \rm -f "$GIT_INDEX_PRIVATE" 2>/dev/null + command rm "$GIT_INDEX_PRIVATE" 2>/dev/null } # Helper function that returns virtual env information to be set in prompt