mirror of
https://github.com/YunoHost-Apps/libreerp_ynh.git
synced 2024-09-03 19:36:13 +02:00
Remove workaround for legacy versions of wkhtmltopdf
This commit is contained in:
parent
426ee8afe5
commit
7ad86a3f00
4 changed files with 4 additions and 42 deletions
|
@ -1,5 +0,0 @@
|
||||||
SOURCE_URL=https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz
|
|
||||||
SOURCE_SUM=049b2cdec9a8254f0ef8ac273afaf54f7e25459a273e27189591edc7d7cf29db
|
|
||||||
SOURCE_FILE=wkhtmltox-0.12.4_linux-generic-amd64.tar.xz
|
|
||||||
SOURCE_FORMAT=tar.xz
|
|
||||||
SOURCE_SUM_PRG=sha256sum
|
|
|
@ -152,20 +152,9 @@ fi
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Building app..." --weight=1
|
ynh_script_progression --message="Building app..." --weight=1
|
||||||
|
|
||||||
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
|
|
||||||
if [ -f '../manifest.json' ] ; then
|
|
||||||
ynh_setup_source /usr/
|
|
||||||
else
|
|
||||||
OLD_YNH_CWD=$YNH_CWD
|
|
||||||
YNH_CWD=$YNH_CWD/../settings/conf
|
|
||||||
ynh_setup_source /usr/
|
|
||||||
YNH_CWD=$OLD_YNH_CWD
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
pushd $final_path
|
pushd $final_path
|
||||||
ynh_exec_warn_less ynh_exec_as $app RUSTUP_HOME="$final_path"/.rustup CARGO_HOME="$final_path"/.cargo bash -c 'curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -q -y'
|
ynh_exec_warn_less ynh_exec_as $app RUSTUP_HOME="$final_path"/.rustup CARGO_HOME="$final_path"/.cargo bash -c 'curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -q -y'
|
||||||
export PATH="$PATH:$final_path/.cargo/bin:$final_path/.local/bin:/usr/local/sbin"
|
export PATH="$PATH:$final_path/.cargo/bin:$final_path/.local/bin:/usr/local/sbin"
|
||||||
if grep "python3" $final_path/$appname/$FORKNAME-bin ; then
|
if grep "python3" $final_path/$appname/$FORKNAME-bin ; then
|
||||||
python3 -m venv venv
|
python3 -m venv venv
|
||||||
venv/bin/pip3 install --upgrade pip
|
venv/bin/pip3 install --upgrade pip
|
||||||
|
|
|
@ -111,20 +111,9 @@ fi
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Building app..." --weight=1
|
ynh_script_progression --message="Building app..." --weight=1
|
||||||
|
|
||||||
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
|
|
||||||
if [ -f '../manifest.json' ] ; then
|
|
||||||
ynh_setup_source /usr/
|
|
||||||
else
|
|
||||||
OLD_YNH_CWD=$YNH_CWD
|
|
||||||
YNH_CWD=$YNH_CWD/../settings/conf
|
|
||||||
ynh_setup_source /usr/
|
|
||||||
YNH_CWD=$OLD_YNH_CWD
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
pushd $final_path
|
pushd $final_path
|
||||||
ynh_exec_warn_less ynh_exec_as $app RUSTUP_HOME="$final_path"/.rustup CARGO_HOME="$final_path"/.cargo bash -c 'curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -q -y'
|
ynh_exec_warn_less ynh_exec_as $app RUSTUP_HOME="$final_path"/.rustup CARGO_HOME="$final_path"/.cargo bash -c 'curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -q -y'
|
||||||
export PATH="$PATH:$final_path/.cargo/bin:$final_path/.local/bin:/usr/local/sbin"
|
export PATH="$PATH:$final_path/.cargo/bin:$final_path/.local/bin:/usr/local/sbin"
|
||||||
if grep "python3" $final_path/$appname/$FORKNAME-bin ; then
|
if grep "python3" $final_path/$appname/$FORKNAME-bin ; then
|
||||||
python3 -m venv venv
|
python3 -m venv venv
|
||||||
venv/bin/pip3 install --upgrade pip
|
venv/bin/pip3 install --upgrade pip
|
||||||
|
|
|
@ -125,20 +125,9 @@ fi
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Building app..." --weight=1
|
ynh_script_progression --message="Building app..." --weight=1
|
||||||
|
|
||||||
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
|
|
||||||
if [ -f '../manifest.json' ] ; then
|
|
||||||
ynh_setup_source /usr/
|
|
||||||
else
|
|
||||||
OLD_YNH_CWD=$YNH_CWD
|
|
||||||
YNH_CWD=$YNH_CWD/../settings/conf
|
|
||||||
ynh_setup_source /usr/
|
|
||||||
YNH_CWD=$OLD_YNH_CWD
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
pushd $final_path
|
pushd $final_path
|
||||||
ynh_exec_warn_less ynh_exec_as $app RUSTUP_HOME="$final_path"/.rustup CARGO_HOME="$final_path"/.cargo bash -c 'curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -q -y'
|
ynh_exec_warn_less ynh_exec_as $app RUSTUP_HOME="$final_path"/.rustup CARGO_HOME="$final_path"/.cargo bash -c 'curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -q -y'
|
||||||
export PATH="$PATH:$final_path/.cargo/bin:$final_path/.local/bin:/usr/local/sbin"
|
export PATH="$PATH:$final_path/.cargo/bin:$final_path/.local/bin:/usr/local/sbin"
|
||||||
if grep "python3" $final_path/$appname/$FORKNAME-bin ; then
|
if grep "python3" $final_path/$appname/$FORKNAME-bin ; then
|
||||||
python3 -m venv venv
|
python3 -m venv venv
|
||||||
venv/bin/pip3 install --upgrade pip
|
venv/bin/pip3 install --upgrade pip
|
||||||
|
@ -151,7 +140,7 @@ pushd $final_path
|
||||||
venv/bin/pip install -r $appname/requirements.txt
|
venv/bin/pip install -r $appname/requirements.txt
|
||||||
fi
|
fi
|
||||||
ynh_secure_remove --file="$final_path/.cargo"
|
ynh_secure_remove --file="$final_path/.cargo"
|
||||||
ynh_secure_remove --file="$final_path/.rustup"
|
ynh_secure_remove --file="$final_path/.rustup"
|
||||||
popd
|
popd
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
Loading…
Add table
Reference in a new issue