From 2f84edd47addd8c61c69e93c5e9568b2df2f4c8d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 5 Sep 2022 03:18:17 +0200 Subject: [PATCH] Fix patch --- scripts/install | 4 ++++ scripts/upgrade | 4 ++++ sources/{patches => }/app-array_key_exists.patch | 0 sources/extra_files/app/.gitignore | 2 -- sources/patches/.gitignore | 2 -- 5 files changed, 8 insertions(+), 4 deletions(-) rename sources/{patches => }/app-array_key_exists.patch (100%) delete mode 100644 sources/extra_files/app/.gitignore delete mode 100644 sources/patches/.gitignore diff --git a/scripts/install b/scripts/install index a6acc30..8d560f6 100755 --- a/scripts/install +++ b/scripts/install @@ -101,6 +101,10 @@ ynh_script_progression --message="Installing $app with Composer..." --weight=5 ynh_install_composer --install_args="--ignore-platform-reqs" 2>&1 +pushd $final_path + patch --strip=1 < $YNH_APP_BASEDIR/sources/app-array_key_exists.patch +popd + #================================================= # ADD A CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ee723c3..21d255e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -98,6 +98,10 @@ ynh_script_progression --message="Installing $app with Composer..." --weight=5 ynh_install_composer --install_args="--ignore-platform-reqs" 2>&1 +pushd $final_path + patch --strip=1 < $YNH_APP_BASEDIR/sources/app-array_key_exists.patch +popd + #================================================= # UPDATE A CONFIG FILE #================================================= diff --git a/sources/patches/app-array_key_exists.patch b/sources/app-array_key_exists.patch similarity index 100% rename from sources/patches/app-array_key_exists.patch rename to sources/app-array_key_exists.patch diff --git a/sources/extra_files/app/.gitignore b/sources/extra_files/app/.gitignore deleted file mode 100644 index 783a4ae..0000000 --- a/sources/extra_files/app/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -*.sw[op] diff --git a/sources/patches/.gitignore b/sources/patches/.gitignore deleted file mode 100644 index 783a4ae..0000000 --- a/sources/patches/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -*.sw[op]