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

Merge pull request #625 from YunoHost/clear_equivs

Browse source 
[enh] Keep it fucking clear...
This commit is contained in:
Alexandre Aubin 2019-01-26 21:19:32 +01:00 • committed by GitHub
commit c90108c172
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/helpers.d/package
View file

@ -131,11 +131,11 @@ ynh_package_install_from_equivs () {
# Install the fake package without its dependencies with dpkg # Install the fake package without its dependencies with dpkg
# Install missing dependencies with ynh_package_install # Install missing dependencies with ynh_package_install
ynh_wait_dpkg_free ynh_wait_dpkg_free
(cp "$controlfile" "${TMPDIR}/control" && cd "$TMPDIR" \ cp "$controlfile" "${TMPDIR}/control"
&& equivs-build ./control 1>/dev/null \ (cd "$TMPDIR"
&& sudo dpkg --force-depends \ equivs-build ./control 1> /dev/null
-i "./${pkgname}_${pkgversion}_all.deb" 2>&1 \ dpkg --force-depends -i "./${pkgname}_${pkgversion}_all.deb" 2>&1)
&& ynh_package_install -f) || ynh_die "Unable to install dependencies" ynh_package_install -f || ynh_die "Unable to install dependencies"
[[ -n "$TMPDIR" ]] && rm -rf $TMPDIR # Remove the temp dir. [[ -n "$TMPDIR" ]] && rm -rf $TMPDIR # Remove the temp dir.
# check if the package is actually installed # check if the package is actually installed