XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib: Improve bash-it update so it can update to latest tag

pull/1626/head
Noah Gorny 2020-06-22 16:19:37 +03:00
parent 21d094ed5a
commit 96295e92a5
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/helpers.bash
View File

@ -79,7 +79,7 @@ bash-it ()
_bash-it-search $component "$@" _bash-it-search $component "$@"
return;; return;;
update) update)
func=_bash-it_update;; func=_bash-it_update-$component;;
migrate) migrate)
func=_bash-it-migrate;; func=_bash-it-migrate;;
version) version)
@ -155,26 +155,49 @@ _bash-it-plugins ()
_bash-it-describe "plugins" "a" "plugin" "Plugin" _bash-it-describe "plugins" "a" "plugin" "Plugin"
} }
_bash-it_update() { _bash-it_update-dev() {
_about 'updates Bash-it to the latest master'
_group 'lib'
_bash-it_update- dev
}
_bash-it_update-stable() {
_about 'updates Bash-it to the latest tag'
_group 'lib'
_bash-it_update- stable
}
_bash-it_update-() {
_about 'updates Bash-it' _about 'updates Bash-it'
_param '1: What kind of update to do (stable|dev)'
_group 'lib' _group 'lib'
local old_pwd="${PWD}" local old_pwd="${PWD}"
cd "${BASH_IT}" || return cd "${BASH_IT}" || return
if [ -z $BASH_IT_REMOTE ]; then if [ -z "$BASH_IT_REMOTE" ]; then
BASH_IT_REMOTE="origin" BASH_IT_REMOTE="origin"
fi fi
# Defaults to stable update
if [ -z "$1" ] || [ "$1" == "stable" ]; then
version="stable"
TARGET=$(git describe --tags "$(git rev-list --tags --max-count=1)")
else
version="dev"
TARGET=${BASH_IT_REMOTE}/master
fi
git fetch &> /dev/null git fetch $BASH_IT_REMOTE --tags &> /dev/null
declare status declare status
status="$(git rev-list master..${BASH_IT_REMOTE}/master 2> /dev/null)" status="$(git rev-list HEAD.."${TARGET}" 2> /dev/null)"
if [[ -n "${status}" ]]; then if [[ -n "${status}" ]]; then
for i in $(git rev-list --merges --first-parent master..${BASH_IT_REMOTE}); do for i in $(git rev-list --merges --first-parent HEAD.."${TARGET}"); do
num_of_lines=$(git log -1 --format=%B $i | awk 'NF' | wc -l) num_of_lines=$(git log -1 --format=%B $i | awk 'NF' | wc -l)
if [ $num_of_lines -eq 1 ]; then if [ $num_of_lines -eq 1 ]; then
description="%s" description="%s"
@ -184,14 +207,14 @@ _bash-it_update() {
git log --format="%h: $description (%an)" -1 $i git log --format="%h: $description (%an)" -1 $i
done done
echo "" echo ""
read -e -n 1 -p "Would you like to update to $(git log -1 --format=%h origin/master)? [Y/n] " RESP read -e -n 1 -p "Would you like to update to ${TARGET}($(git log -1 --format=%h "${TARGET}"))? [Y/n] " RESP
case $RESP in case $RESP in
[yY]|"") [yY]|"")
git pull --rebase &> /dev/null git checkout "${TARGET}" &> /dev/null
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
echo "Bash-it successfully updated." echo "Bash-it successfully updated."
echo "" echo ""
echo "Migrating your installation to the latest version now..." echo "Migrating your installation to the latest $version version now..."
_bash-it-migrate _bash-it-migrate
echo "" echo ""
echo "All done, enjoy!" echo "All done, enjoy!"