mirror of
https://github.com/YunoHost-Apps/libreerp_ynh.git
synced 2024-09-03 19:36:13 +02:00
[autopatch] TEST BEFORE MERGE ynh_setup_source --full_replace=1
This commit is contained in:
parent
426ee8afe5
commit
670e76488b
2 changed files with 4 additions and 4 deletions
|
@ -114,11 +114,11 @@ ynh_script_progression --message="Building app..." --weight=1
|
||||||
if ! wkhtmltopdf --version | grep "wkhtmltopdf 0.12.4 (with patched qt)"; then
|
if ! wkhtmltopdf --version | grep "wkhtmltopdf 0.12.4 (with patched qt)"; then
|
||||||
# The debian package has a bug so we deploy a more recent version
|
# The debian package has a bug so we deploy a more recent version
|
||||||
if [ -f '../manifest.json' ] ; then
|
if [ -f '../manifest.json' ] ; then
|
||||||
ynh_setup_source /usr/
|
ynh_setup_source /usr/ --full_replace=1
|
||||||
else
|
else
|
||||||
OLD_YNH_CWD=$YNH_CWD
|
OLD_YNH_CWD=$YNH_CWD
|
||||||
YNH_CWD=$YNH_CWD/../settings/conf
|
YNH_CWD=$YNH_CWD/../settings/conf
|
||||||
ynh_setup_source /usr/
|
ynh_setup_source /usr/ --full_replace=1
|
||||||
YNH_CWD=$OLD_YNH_CWD
|
YNH_CWD=$OLD_YNH_CWD
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -128,11 +128,11 @@ ynh_script_progression --message="Building app..." --weight=1
|
||||||
if ! wkhtmltopdf --version | grep "wkhtmltopdf 0.12.4 (with patched qt)"; then
|
if ! wkhtmltopdf --version | grep "wkhtmltopdf 0.12.4 (with patched qt)"; then
|
||||||
# The debian package has a bug so we deploy a more recent version
|
# The debian package has a bug so we deploy a more recent version
|
||||||
if [ -f '../manifest.json' ] ; then
|
if [ -f '../manifest.json' ] ; then
|
||||||
ynh_setup_source /usr/
|
ynh_setup_source /usr/ --full_replace=1
|
||||||
else
|
else
|
||||||
OLD_YNH_CWD=$YNH_CWD
|
OLD_YNH_CWD=$YNH_CWD
|
||||||
YNH_CWD=$YNH_CWD/../settings/conf
|
YNH_CWD=$YNH_CWD/../settings/conf
|
||||||
ynh_setup_source /usr/
|
ynh_setup_source /usr/ --full_replace=1
|
||||||
YNH_CWD=$OLD_YNH_CWD
|
YNH_CWD=$OLD_YNH_CWD
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue