Merge branch 'meienberger:master' into master

This commit is contained in:
allaeddine boulefaat 2022-09-15 10:52:30 +01:00 committed by GitHub
commit 07e8be4c41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions

View file

@ -1,4 +1,7 @@
#!/usr/bin/env bash
# Required Notice: Copyright
# Umbrel (https://umbrel.com)
set -euo pipefail
# use greadlink instead of readlink on osx

View file

@ -26,7 +26,7 @@ function install_docker() {
sudo apt-get update
sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
return 0
elif [[ "${os}" == "ubuntu" ]]; then
elif [[ "${os}" == "ubuntu" || "${os}" == "pop" ]]; then
sudo apt-get update
sudo apt-get upgrade
sudo apt-get install -y ca-certificates curl gnupg lsb-release
@ -70,7 +70,7 @@ function install_jq() {
local os="${1}"
echo "Installing jq for os ${os}" >/dev/tty
if [[ "${os}" == "debian" || "${os}" == "ubuntu" ]]; then
if [[ "${os}" == "debian" || "${os}" == "ubuntu" || "${os}" == "pop" ]]; then
sudo apt-get update
sudo apt-get install -y jq
return 0

View file

@ -1,4 +1,8 @@
#!/usr/bin/env bash
# Required Notice: Copyright
# Umbrel (https://umbrel.com)
set -e # Exit immediately if a command exits with a non-zero status.
# use greadlink instead of readlink on osx