YunoHost-Apps/nextcloud_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/nextcloud_ynh.git synced 2024-09-03 19:55:57 +02:00
Code Issues Activity Actions

Fix the patches stuff, there's no need to manually cp stuff, patches are already applied only for the 'main' source

Browse source
This commit is contained in:
Alexandre Aubin 2024-07-01 18:00:53 +02:00
parent 727b835bf8
commit f9ead85cfe
6 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
manifest.toml
View file

@ -73,6 +73,7 @@ ram.runtime = "512M"
[resources.sources.28] [resources.sources.28]
url = 'https://download.nextcloud.com/server/releases/nextcloud-28.0.0.tar.bz2' url = 'https://download.nextcloud.com/server/releases/nextcloud-28.0.0.tar.bz2'
sha256 = '4e8b0b74b40221e85f92ab869d0873c69a52d7e43889d9259c6259428a6a36f2' sha256 = '4e8b0b74b40221e85f92ab869d0873c69a52d7e43889d9259c6259428a6a36f2'
prefetch = false
[resources.sources.27] [resources.sources.27]
url = 'https://download.nextcloud.com/server/releases/nextcloud-27.0.0.tar.bz2' url = 'https://download.nextcloud.com/server/releases/nextcloud-27.0.0.tar.bz2'

0
sources/patches_last_version/app-00-add-logout_url-conf.patch → patches/main/00-add-logout_url-conf.patch
View file

0
sources/patches_last_version/app-01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch → patches/main/01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch
View file

0
sources/patches_last_version/app-02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch → patches/main/02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch
View file

2
scripts/install
View file

@ -25,8 +25,6 @@ ynh_mysql_db_shell \
#================================================= #=================================================
ynh_script_progression "Setting up source files..." ynh_script_progression "Setting up source files..."
# Enable YunoHost patches on Nextcloud sources
cp -a ../sources/patches_last_version/* ../sources/patches
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$install_dir" ynh_setup_source --dest_dir="$install_dir"

1
scripts/upgrade
View file

@ -155,7 +155,6 @@ then
next_major_version="$(( $current_major_version + 1 ))" next_major_version="$(( $current_major_version + 1 ))"
if [[ "$next_major_version" -ge "$last_major_version" ]]; then if [[ "$next_major_version" -ge "$last_major_version" ]]; then
ynh_print_info "Upgrading to Nextcloud $last_version" ynh_print_info "Upgrading to Nextcloud $last_version"
cp -a ../patches_last_version/* ../patches
source_id="main" source_id="main"
else else
ynh_print_info "Upgrading to Nextcloud $next_major_version" ynh_print_info "Upgrading to Nextcloud $next_major_version"