1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/libreto_ynh.git synced 2024-09-03 19:36:14 +02:00

Merge branch 'testing' into version-2

This commit is contained in:
Alexandre Aubin 2023-07-04 00:58:51 +02:00 committed by GitHub
commit da97fa2e3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions

View file

@ -26,9 +26,11 @@ git config --system --add safe.directory $install_dir
# Note: We use git instead of ynh_setup_source, cause this repo use submodules
git clone https://github.com/zamentur/libreto.git "$install_dir" --quiet
chown -R $app:www-data "$install_dir"
pushd "$install_dir"
git checkout $COMMIT --quiet
git submodule update --init --recursive --quiet
ynh_exec_as $app git checkout $COMMIT --quiet
ynh_exec_as $app git submodule update --init --recursive --quiet
popd
chmod -R o-rwx "$install_dir"

View file

@ -25,15 +25,14 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
then
ynh_script_progression --message="Upgrading source files..." --weight=5
git config --system --add safe.directory $install_dir
chown -R $app:www-data "$install_dir"
# Download, check integrity, uncompress and patch the source from app.src
pushd "$install_dir"
git checkout master
git pull --quiet
git checkout $COMMIT --quiet
git config --global --add safe.directory $install_dir/libreto/vendor/Markdownify
git submodule update --init --recursive --quiet
ynh_exec_as $app git checkout master
ynh_exec_as $app git pull --quiet
ynh_exec_as $app git checkout $COMMIT --quiet
ynh_exec_as $app git submodule update --init --recursive --quiet
popd
fi