YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] First source patches failure doesn't stop app script

Browse source
This commit is contained in:
ljf (zamentur) 2023-12-15 01:23:49 +01:00
parent c0337bf1ef
commit 770fdb6861
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
helpers/utils
View file

@ -351,13 +351,12 @@ ynh_setup_source() {
if [ -d "$YNH_APP_BASEDIR/sources/patches/" ]; then if [ -d "$YNH_APP_BASEDIR/sources/patches/" ]; then
local patches_folder=$(realpath $YNH_APP_BASEDIR/sources/patches/) local patches_folder=$(realpath $YNH_APP_BASEDIR/sources/patches/)
if (($(find $patches_folder -type f -name "${source_id}-*.patch" 2>/dev/null | wc --lines) > "0")); then if (($(find $patches_folder -type f -name "${source_id}-*.patch" 2>/dev/null | wc --lines) > "0")); then
( pushd "$dest_dir"
cd "$dest_dir" for p in $patches_folder/${source_id}-*.patch; do
for p in $patches_folder/${source_id}-*.patch; do echo $p
echo $p patch --strip=1 <$p || ynh_die --message="Unable to apply patches"
patch --strip=1 <$p done
done popd
) || ynh_die --message="Unable to apply patches"
fi fi
fi fi