mirrors/vm
2
0
Fork 0
mirror of https://github.com/nextcloud/vm.git synced 2025-10-26 11:27:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

add git_apply_patch() (#866)

Browse Source
This commit is contained in:
Daniel Hansson 2019-07-06 15:09:53 +02:00 committed by GitHub
parent db3b2d6264
commit 52addfe220
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib.sh
View File

@ -1052,6 +1052,21 @@ print_text_in_color() {
printf "%b%s%b\n" "$1" "$2" "$Color_Off"
}
# Patch upload bug
# git_apply_patch 15992 server
# 1 = pull
# 2 = repository
git_apply_patch() {
curl_to_dir "https://patch-diff.githubusercontent.com/raw/nextcloud/${2}/pull" "${1}.patch" "/tmp"
install_if_not git
cd "$NCPATH"
if git apply --check /tmp/"${1}".patch >/dev/null 2>&1
then
print_text_in_color "IGreen" "Applying patch ${1} from the ${2} repository..."
git apply /tmp/"${1}".patch
fi
}
## bash colors
# Reset
Color_Off='\e[0m' # Text Reset

3
nextcloud_update.sh
View File

@ -235,6 +235,9 @@ fi
# Replace the permissions script
run_static_script setup_secure_permissions_nextcloud
###### TEMPORARY 2019-07-06 ###########
git_apply_patch 15992 server ## 16.0.2
# Set secure permissions
if [ ! -f "$SECURE" ]
then