Skip to content
Snippets Groups Projects
Commit 064dbf07 authored by nimrod's avatar nimrod
Browse files

- Fix issues in bashrc when sourced in a script (like the post-merge

git hook).
- Fix issue with failure to source bashrc in the post-merge git hook
(file not found issue).
parent bf68ebc2
Branches
No related tags found
No related merge requests found
......@@ -7,7 +7,7 @@ export HISTCONTROL=ignoreboth:erasedups
export HISTSIZE=100000
export HISTFILESIZE=100000
export PROMPT_COMMAND="history -a; $PROMPT_COMMAND"
if [ -n "$BASH" ]
if [ -n "${BASH:-}" ]
then
shopt -s histappend
shopt -s checkwinsize
......@@ -26,7 +26,7 @@ fi
[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
# set variable identifying the chroot you work in (used in the prompt below)
if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
debian_chroot=$(cat /etc/debian_chroot)
fi
......
#!/bin/sh
set -eu
. .bashrc
cd "$(git rev-parse --show-toplevel)"
. ./.bashrc
gen-ssh-config
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment