wyj/gentoo-zh
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo-zh.git synced 2025-04-10 11:58:43 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

app-shells/oh-my-bash: simplify custom upgrade patch

Browse Source
This commit is contained in:
blackteahamburger 2024-12-07 19:17:04 +08:00 committed by peeweep
parent 5d7076de05
commit 7965d1a7cb
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -25,18 +25,22 @@
@@ -25,18 +25,10 @@
printf '%s\n' "${BLUE}Updating Oh My Bash${NORMAL}"
@ -12,24 +12,12 @@
- # In case it enters the rebasing mode
- printf '%s\n' "oh-my-bash: running 'git rebase --abort'..."
- command git --git-dir="$OSH/.git" --work-tree="$OSH" rebase --abort
+ # Switch for the use of "sudo"
+ local _omb_tmp_sudo=
+ if [[ ${OMB_UPGRADE_SUDO+set} ]]; then
+ _omb_tmp_sudo=${OMB_UPGRADE_SUDO:+OMB_UPGRADE_SUDO }
+ elif [[ ${OMB_USE_SUDO-true} == true ]]; then
+ if ((EUID != 0)) && _omb_util_binary_exists sudo; then
+ _omb_tmp_sudo='sudo '
+ fi
+ fi
+
+ if _omb_util_binary_exists smart-live-rebuild; then
+ ${_omb_tmp_sudo} smart-live-rebuild -f app-shells/oh-my-bash || return 1
+ else
+ if ! command smart-live-rebuild -f app-shells/oh-my-bash; then
printf "${RED}%s${NORMAL}\n" \
'There was an error updating.' \
- "If you have uncommited changes in '$BOLD$OSH$NORMAL$RED', please commit, stash or discard them and retry updating." \
- "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."
+ "Please install app-portage/smart-live-rebuild and retry updating."
+ "If app-portage/smart-live-rebuild is not installed, please install and retry updating."
return 1
fi