diff --git a/docs/01-getting-started.md b/docs/01-getting-started.md index 858e0fa..6dce42e 100644 --- a/docs/01-getting-started.md +++ b/docs/01-getting-started.md @@ -45,7 +45,7 @@ wsl --install ```sh /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" -brew install make +brew install git make jq ``` ## Universal getting started diff --git a/scripts/general/configure-docker.sh b/scripts/general/configure-docker.sh index ca7034e..0fc100e 100755 --- a/scripts/general/configure-docker.sh +++ b/scripts/general/configure-docker.sh @@ -8,10 +8,10 @@ if [[ $(uname) == "Linux" ]]; then if grep -q "debian" /etc/os-release; then - echo "Adding Docker apt repo on Linux..." - if [[ -z $(grep -r download.docker.com /etc/apt/sources.list.d/) ]]; then + echo "Adding Docker apt repo on Linux..." + if grep -q "Ubuntu" /etc/os-release; then echo "Adding Docker repo for $(lsb_release -cs)..." @@ -59,7 +59,7 @@ if [[ $(uname) == "Linux" ]]; then if grep -q "debian" /etc/os-release; then apt-get update - apt-get -y install docker-ce docker-ce-cli containerd.io docker-compose-plugin git-lfs curl jq + apt-get -y install docker-ce docker-ce-cli containerd.io docker-compose-plugin git-lfs curl elif grep -q "arch" /etc/os-release; then diff --git a/scripts/general/prepare.sh b/scripts/general/prepare.sh index af6b59f..3c87336 100755 --- a/scripts/general/prepare.sh +++ b/scripts/general/prepare.sh @@ -33,7 +33,7 @@ if [[ $(uname) == "Darwin" ]]; then echo "Configuring MacOS..." echo "Installing MacOS packages with homebrew..." - brew install git-lfs curl jq + brew install git-lfs curl fi @@ -45,7 +45,7 @@ if [[ $(uname) == "Linux" ]]; then echo "Installing required deb packages..." apt-get update - apt-get install git-lfs curl make jq -y + apt-get install git-lfs curl make -y if [[ "${MAKEVAR_ALLOW_HOST_SSH_ACCESS}" == "true" ]]; then @@ -57,12 +57,13 @@ if [[ $(uname) == "Linux" ]]; then elif grep -q "arch" /etc/os-release; then echo "Installing required pacman packages..." - pacman -S git git-lfs make curl jq --noconfirm + pacman -S git git-lfs make curl --noconfirm else echo "Unsupported OS" + echo "Please install git." echo "Please install git LFS for your OS and initialize it." echo "Please install curl" echo "Please install jq"