Skip to content

Commit

Permalink
Merge pull request #82 from YunoHost/bookworm
Browse files Browse the repository at this point in the history
Fix issues when fixing shellcheck issues
  • Loading branch information
alexAubin authored Oct 31, 2024
2 parents 53f4350 + d7c6df8 commit 259239c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions bookworm
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ function check_assertions()
fi

# Check we aren't running in docker or other weird containers that we can't probably install on
if systemd-detect-virt | grep -v -q -w "docker\|container-other" && [[ "$FORCE" != "true" ]]; then
if systemd-detect-virt | grep -q -w "docker\|container-other" && [[ "$FORCE" != "true" ]]; then
error "It seems like you are trying to install YunoHost in docker or a weird container technology which probably is not supported by this install script (or YunoHost as a whole). If you know what you are doing, you can run this script with -f."
return 1
fi
Expand All @@ -328,7 +328,7 @@ function check_assertions()
error "Bind9 is installed on your system. Yunohost conflicts with Bind9 because it requires dnsmasq. To be able to run this script, you should first run 'apt remove bind9 --purge --autoremove'."
return 1
fi
if dpkg --get-selections | grep -v deinstall | grep 8Q 'apache2\s' && [[ "$FORCE" != "true" ]]; then
if dpkg --get-selections | grep -v deinstall | grep -q 'apache2\s' && [[ "$FORCE" != "true" ]]; then
error "Apache is installed on your system. Yunohost conflicts with apache2 because it requires nginx. To be able to run this script, you should first run 'apt remove apache2 --purge --autoremove'."
return 1
fi
Expand Down

0 comments on commit 259239c

Please sign in to comment.