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:
commit
da97fa2e3d
2 changed files with 9 additions and 8 deletions
|
@ -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
|
# 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
|
git clone https://github.com/zamentur/libreto.git "$install_dir" --quiet
|
||||||
|
|
||||||
|
chown -R $app:www-data "$install_dir"
|
||||||
|
|
||||||
pushd "$install_dir"
|
pushd "$install_dir"
|
||||||
git checkout $COMMIT --quiet
|
ynh_exec_as $app git checkout $COMMIT --quiet
|
||||||
git submodule update --init --recursive --quiet
|
ynh_exec_as $app git submodule update --init --recursive --quiet
|
||||||
popd
|
popd
|
||||||
|
|
||||||
chmod -R o-rwx "$install_dir"
|
chmod -R o-rwx "$install_dir"
|
||||||
|
|
|
@ -25,15 +25,14 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
|
||||||
then
|
then
|
||||||
ynh_script_progression --message="Upgrading source files..." --weight=5
|
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
|
# Download, check integrity, uncompress and patch the source from app.src
|
||||||
pushd "$install_dir"
|
pushd "$install_dir"
|
||||||
git checkout master
|
ynh_exec_as $app git checkout master
|
||||||
git pull --quiet
|
ynh_exec_as $app git pull --quiet
|
||||||
git checkout $COMMIT --quiet
|
ynh_exec_as $app git checkout $COMMIT --quiet
|
||||||
git config --global --add safe.directory $install_dir/libreto/vendor/Markdownify
|
ynh_exec_as $app git submodule update --init --recursive --quiet
|
||||||
git submodule update --init --recursive --quiet
|
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue