Skip to content

Commit 259239c

Browse files
authored
Merge pull request #82 from YunoHost/bookworm
Fix issues when fixing shellcheck issues
2 parents 53f4350 + d7c6df8 commit 259239c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

bookworm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ function check_assertions()
319319
fi
320320

321321
# Check we aren't running in docker or other weird containers that we can't probably install on
322-
if systemd-detect-virt | grep -v -q -w "docker\|container-other" && [[ "$FORCE" != "true" ]]; then
322+
if systemd-detect-virt | grep -q -w "docker\|container-other" && [[ "$FORCE" != "true" ]]; then
323323
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."
324324
return 1
325325
fi
@@ -328,7 +328,7 @@ function check_assertions()
328328
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'."
329329
return 1
330330
fi
331-
if dpkg --get-selections | grep -v deinstall | grep 8Q 'apache2\s' && [[ "$FORCE" != "true" ]]; then
331+
if dpkg --get-selections | grep -v deinstall | grep -q 'apache2\s' && [[ "$FORCE" != "true" ]]; then
332332
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'."
333333
return 1
334334
fi

0 commit comments

Comments
 (0)