. "$HOME"/.shellrc
-# append to the history file, don't overwrite it
-shopt -s histappend
+if [ "$HISTFILE" = "$HOME/.bash_history" ]; then
+ # This is the default value set by interactive bash
+ # when the global value was unset. Unset it here too.
+ unset HISTFILE
+fi
# check the window size after each command and, if necessary,
# update the values of LINES and COLUMNS.
# match all files and zero or more directories and subdirectories.
#shopt -s globstar
+# append to the history file, don't overwrite it
+shopt -s histappend
+
[ "`type -t ls`" = alias ] && unalias ls
[ "`type -t ll`" = alias ] && unalias ll
if [ -n "$remote" ] && git config --get remote.$remote.url |
grep -q '^\(file:/\|/\|\.\./\)'; then # (file:/ or / or ../ at the beginning)
cdgitpath remote.$remote.url
- else
+ return
+ fi
- if [ -n "$1" ]; then
- echo "Cannot find directory for remote $1" >&2
- echo "Usage: cdremote [remote_name]" >&2
- return 1
- fi
+ if [ -n "$1" ]; then
+ echo "Cannot find directory for remote $1" >&2
+ echo "Usage: cdremote [remote_name]" >&2
+ return 1
+ fi
- _list_remotes '^\(file:/\|/\|\.\./\)' # (file:/ or / or ../ at the beginning)
- if [ ${#GIT_REMOTES[*]} -eq 1 ]; then
- remote=${GIT_REMOTES[0]}
- unset GIT_REMOTES
- cdgitpath remote.$remote.url
- else
- unset GIT_REMOTES
- echo "Cannot find directory for any remote" >&2
- echo "Usage: cdremote [remote_name]" >&2
- return 1
- fi
+ _list_remotes '^\(file:/\|/\|\.\./\)' # (file:/ or / or ../ at the beginning)
+ if [ ${#GIT_REMOTES[*]} -eq 1 ]; then
+ remote=${GIT_REMOTES[0]}
+ unset GIT_REMOTES
+ cdgitpath remote.$remote.url
+ else
+ unset GIT_REMOTES
+ echo "Cannot find directory for any remote" >&2
+ echo "Usage: cdremote [remote_name]" >&2
+ return 1
fi
}
complete -F _git_open_remote git-open-remote
fi
+
+
+if [ "$SHLVL" -eq 1 -a "`type -t X`" = function ] && which startx >/dev/null 2>&1; then
+ # From https://stackoverflow.com/a/18839557
+
+ copy_function() {
+ test -n "$(declare -f "$1")" || return
+ eval "${_/$1/$2}"
+ }
+
+ rename_function() {
+ copy_function "$@" || return
+ unset -f "$1"
+ }
+
+ rename_function X _non_bash_X
+
+ X() { history -a; _non_bash_X; history -r; }
+fi