From 1a7d0f5c56dafb3c389c586d9df0697462705be3 Mon Sep 17 00:00:00 2001 From: Anshul Singh Date: Tue, 6 Dec 2022 12:14:58 +0530 Subject: [PATCH 1/2] Adds docker desktop option in setup.sh --- setup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.sh b/setup.sh index 78f969a0..d35bf91e 100755 --- a/setup.sh +++ b/setup.sh @@ -47,6 +47,9 @@ DOCKER_PID_FILE=/var/run/docker.pid if [ -f "$DOCKER_PID_FILE" ]; then echo -e "Docker is running." else + DOCKER_PID_FILE=/var/run/docker-desktop-proxy.pid # for Docker desktop users + if [ -f "$DOCKER_PID_FILE" ]; then + echo -e "Docker is running." echo -e '\e[31mDocker daemon is not running' echo -e '\e[31mAborting...' echo -e "\e[31mPlease start docker daemon and restart again" From 5d08c28c2d0a839ee315a0dad55a4773f59236ce Mon Sep 17 00:00:00 2001 From: Anshul Singh Date: Tue, 6 Dec 2022 12:24:15 +0530 Subject: [PATCH 2/2] Fixes elif statement --- setup.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/setup.sh b/setup.sh index d35bf91e..3f3ce051 100755 --- a/setup.sh +++ b/setup.sh @@ -47,13 +47,16 @@ DOCKER_PID_FILE=/var/run/docker.pid if [ -f "$DOCKER_PID_FILE" ]; then echo -e "Docker is running." else - DOCKER_PID_FILE=/var/run/docker-desktop-proxy.pid # for Docker desktop users - if [ -f "$DOCKER_PID_FILE" ]; then - echo -e "Docker is running." - echo -e '\e[31mDocker daemon is not running' - echo -e '\e[31mAborting...' - echo -e "\e[31mPlease start docker daemon and restart again" - exit + # for Docker desktop users + DOCKER_PID_FILE=/var/run/docker-desktop-proxy.pid + if [ -f "$DOCKER_PID_FILE" ]; then + echo -e "Docker is running." + else + echo -e '\e[31mDocker daemon is not running' + echo -e '\e[31mAborting...' + echo -e "\e[31mPlease start docker daemon and restart again" + exit + fi fi echo -e "Installing air for live reloading"