70c9501550
The ability to not define default aliases in the `.git.scmbrc` file
leading to not having those aliases not present worked fine in bash.
However, this seems to still have thrown an error in zsh. For example,
if you commented out the line:
git_checkout_alias="gco"
then when sourcing scm_breeze aliases.sh would throw an error.
This applied only to aliases defined with the `_alias()` function and
not those with the `_git_alias()` function.
To fix this, I wrapped `_alias()` in a similar check to the one
`_git_alias()` has, where it passes the portions as arguments and
verifies the first is present before proceeding.
I'm not 100% certain why seperate functions exist for these two things
to begin with (as far as I can tell from a cursory examination the main
difference is `_git_aliases()` defines a tab completion?) but I believe
my change has fixed the ability to comment out aliases in `.git.scmbrc`
in zsh for users who do not want them (I'm in this boat, there are too
many for me and I get confused).
I tested manually in both bash and zsh and it appears to work, however
you might want to review this before merging given my relative
unfamiliarity with the codebase.
74 lines
2.9 KiB
Bash
74 lines
2.9 KiB
Bash
# Detect shell
|
|
if [ -n "${ZSH_VERSION:-}" ]; then shell="zsh"; else shell="bash"; fi
|
|
# Detect whether zsh 'shwordsplit' option is on by default.
|
|
if [ $shell = "zsh" ]; then zsh_shwordsplit=$( (setopt | grep -q shwordsplit) && echo "true" ); fi
|
|
# Switch on/off shwordsplit for functions that require it.
|
|
zsh_compat(){ if [ $shell = "zsh" ] && [ -z $zsh_shwordsplit ]; then setopt shwordsplit; fi; }
|
|
zsh_reset(){ if [ $shell = "zsh" ] && [ -z $zsh_shwordsplit ]; then unsetopt shwordsplit; fi; }
|
|
# Enable/disable nullglob for zsh or bash
|
|
enable_nullglob() { if [ $shell = "zsh" ]; then setopt NULL_GLOB; else shopt -s nullglob; fi; }
|
|
disable_nullglob() { if [ $shell = "zsh" ]; then unsetopt NULL_GLOB; else shopt -u nullglob; fi; }
|
|
|
|
# Alias wrapper that ignores errors if alias is not defined.
|
|
_safe_alias(){ alias "$@" 2> /dev/null; }
|
|
_alias() {
|
|
if [ -n "$1" ]; then
|
|
local alias_str="$1"; local cmd="$2"
|
|
_safe_alias $alias_str="$cmd"
|
|
fi
|
|
}
|
|
|
|
find_binary(){
|
|
if [ $shell = "zsh" ]; then
|
|
builtin type -p "$1" | sed "s/$1 is //" | head -1
|
|
else
|
|
builtin type -P "$1"
|
|
fi
|
|
}
|
|
|
|
export GIT_BINARY=$(find_binary git)
|
|
|
|
# Updates SCM Breeze from GitHub.
|
|
update_scm_breeze() {
|
|
currDir=$PWD
|
|
cd "$scmbDir"
|
|
oldHEAD=$(git rev-parse HEAD 2> /dev/null)
|
|
git pull origin master
|
|
# Reload latest version of '_create_or_patch_scmbrc' function
|
|
source "$scmbDir/lib/scm_breeze.sh"
|
|
_create_or_patch_scmbrc $oldHEAD
|
|
# Reload SCM Breeze
|
|
source "$scmbDir/scm_breeze.sh"
|
|
cd "$currDir"
|
|
}
|
|
|
|
# Create '~/.*.scmbrc' files, or attempt to patch them if passed a previous revision
|
|
_create_or_patch_scmbrc() {
|
|
patchfile=$(mktemp -t tmp.XXXXXXXXXX)
|
|
# Process '~/.scmbrc' and '~/.*.scmbrc'
|
|
for prefix in "" "git."; do
|
|
# Create file from example if it doesn't already exist
|
|
if ! [ -e "$HOME/.$prefix""scmbrc" ]; then
|
|
cp "$scmbDir/$prefix""scmbrc.example" "$HOME/.$prefix""scmbrc"
|
|
printf "== '~/.$prefix""scmbrc' has been created. Please edit this file to change SCM Breeze settings.\n"
|
|
# If file exists, attempt to update it with any new settings
|
|
elif [ -n "$1" ]; then
|
|
# Create diff of example file, substituting example file for user's config.
|
|
git diff $1 "$prefix""scmbrc.example" | sed "s/$prefix""scmbrc.example/.$prefix""scmbrc/g" >| $patchfile
|
|
if [ -s $patchfile ]; then # If patchfile is not empty
|
|
cd "$HOME"
|
|
# If the patch cannot be applied cleanly, show the updates and tell user to update file manually.
|
|
if ! patch -f "$HOME/.$prefix""scmbrc" $patchfile; then
|
|
printf "== \033[0;31mUpdates could not be applied to '\033[1m~/.$prefix""scmbrc\033[0;31m'.\033[0m\n"
|
|
printf "== Please look at the following changes and manually update '~/.$prefix""scmbrc', if necessary.\n\n"
|
|
cat "$HOME/.$prefix""scmbrc.rej"
|
|
fi
|
|
cd "$scmbDir"
|
|
fi
|
|
fi
|
|
done
|
|
}
|
|
|
|
# Update ~/.scmbrc, ~/.git.scmbrc, etc. from latest commit
|
|
alias update_scmbrc_from_latest_commit="_create_or_patch_scmbrc HEAD~"
|