app-shells/oh-my-bash/files/oh-my-bash-9999-custom-upgrade.patch

   1 --- a/tools/upgrade.sh
   2 +++ b/tools/upgrade.sh
   3 @@ -25,18 +25,10 @@
   4
   5    printf '%s\n' "${BLUE}Updating Oh My Bash${NORMAL}"
   6
   7 -  # Note: The git option "-C PATH" is only supported from git-1.8.5
   8 -  # (https://github.com/git/git/commit/44e1e4d6 2013-09).  On the other hand,
   9 -  # the synonym "--git-dir=PATH/.git --work-tree=PATH" is supported from
  10 -  # git-1.5.3 (https://github.com/git/git/commit/892c41b9 2007-06).
  11 -  if ! command git --git-dir="$OSH/.git" --work-tree="$OSH" pull --rebase --stat origin master; then
  12 -    # In case it enters the rebasing mode
  13 -    printf '%s\n' "oh-my-bash: running 'git rebase --abort'..."
  14 -    command git --git-dir="$OSH/.git" --work-tree="$OSH" rebase --abort
  15 +  if ! command smart-live-rebuild -f app-shells/oh-my-bash; then
  16      printf "${RED}%s${NORMAL}\n" \
  17             'There was an error updating.' \
  18 -           "If you have uncommited changes in '$BOLD$OSH$NORMAL$RED', please commit, stash or discard them and retry updating." \
  19 -           "If you have your own local commits in '$BOLD$OSH$NORMAL$RED' that conflict with the upstream changes, please resolve conflicts and merge the upstream manually."
  20 +           "If app-portage/smart-live-rebuild is not installed, please install and retry updating."
  21      return 1
  22    fi
  23