Skip to content

make git_apply_patch work for apps as well #2570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
enoch85 merged 2 commits into from
Sep 29, 2023
Merged

make git_apply_patch work for apps as well #2570

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d67223
make it work for apps as well
enoch85 Sep 29, 2023
95d398e
SC
enoch85 Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1847,10 +1847,14 @@ printf "%b%s%b\n" "$1" "$2" "$Color_Off"
}

# Apply patch
# git_apply_patch 15992 server 16.0.2
# App:
# git_apply_patch "319" "fulltextsearch_elasticsearch" "27.1.1" "$NCPATH/apps/fulltextsearch_elasticsearch"
# Server:
# git_apply_patch "15992" "server" "16.0.2" "$NCPATH"
# 1 = pull
# 2 = repository
# Nextcloud version
# 3 = Nextcloud version
# 4 = Folder on system
git_apply_patch() {
if [ -z "$NCVERSION" ]
then
Expand All @@ -1860,7 +1864,7 @@ if [[ "$CURRENTVERSION" = "$3" ]]
then
curl_to_dir "https://patch-diff.githubusercontent.com/raw/nextcloud/${2}/pull" "${1}.patch" "/tmp"
install_if_not git
cd "$NCPATH"
cd "${4}"
if git apply --check /tmp/"${1}".patch >/dev/null 2>&1
then
print_text_in_color "$IGreen" "Applying patch https://github.com/nextcloud/${2}/pull/${1} ..."
Expand Down