Use '$SHELL' if it's defined on the image, if not, look for 'bash', and finally use 'sh' if everything else fails

Author: felladrin

components/gitpod-cli/cmd/rebuild.go

@@ -181,24 +181,23 @@ func runRebuild(ctx context.Context, supervisorClient *supervisor.SupervisorClie
 		dockerPath,
 		"run",
 		"--rm",
-		"-e", fmt.Sprintf("SHELL=%s", os.Getenv("SHELL")),
 		"-v", "/workspace:/workspace",
 		"--label", "gp-rebuild=true",
 		"-it", tag,
-		"/bin/sh",
+		"sh",
 		"-c",
 		fmt.Sprintf(`
 			echo "%s";
 			cd "%s";
-			if [ -x "$(command -v /bin/bash)" ]; then
-				if [ -x "$(command -v $SHELL)" ]; then
-					$SHELL;
+			if [ -x "$(command -v $SHELL)" ]; then
+				$SHELL;
+			else
+				if [ -x "$(command -v bash)" ]; then
+					bash;
 				else
-					/bin/bash;
+					sh;
 				fi;
-			else
-				/bin/sh;
-			fi
+			fi;
 		`, welcomeMessage, wsInfo.CheckoutLocation),
 	)