2 files changed, 33 insertions, 8 deletions

diff --git a/cli.py b/cli.py
index 9c67f10f3..16eb0d469 100644
--- a/cli.py
+++ b/cli.py
@@ -45,15 +45,23 @@ d88P     888  "Y88888  "Y888 "Y88P"   "Y8888P88 888           888
 
     script_dir = os.path.dirname(os.path.realpath(__file__))
     setup_script = os.path.join(script_dir, "setup.sh")
+    install_error = False
     if os.path.exists(setup_script):
         click.echo(click.style("🚀 Setup initiated...\n", fg="green"))
-        subprocess.Popen([setup_script], cwd=script_dir)
+        try:
+            subprocess.check_call([setup_script], cwd=script_dir)
+        except subprocess.CalledProcessError:
+            click.echo(
+                click.style("❌ There was an issue with the installation.", fg="red")
+            )
+            install_error = True
     else:
         click.echo(
             click.style(
                 "❌ Error: setup.sh does not exist in the current directory.", fg="red"
             )
         )
+        install_error = True
 
     try:
         # Check if GitHub user name is configured
@@ -99,7 +107,8 @@ d88P     888  "Y88888  "Y888 "Y88P"   "Y8888P88 888           888
                 '  git config --global user.email "Your GitHub Email"', fg="red"
             )
         )
-
+        install_error = True
+    print_access_token_instructions = False
     # Check for the existence of the .github_access_token file
     if os.path.exists(".github_access_token"):
         with open(".github_access_token", "r") as file:
@@ -125,6 +134,7 @@ d88P     888  "Y88888  "Y888 "Y88P"   "Y8888P88 888           888
                             )
                         )
                     else:
+                        install_error = True
                         click.echo(
                             click.style(
                                 "❌ GitHub access token does not have the required permissions. Please ensure it has 'public_repo' or 'repo' scope.",
@@ -132,6 +142,7 @@ d88P     888  "Y88888  "Y888 "Y88P"   "Y8888P88 888           888
                             )
                         )
                 else:
+                    install_error = True
                     click.echo(
                         click.style(
                             "❌ Failed to validate GitHub access token. Please ensure it is correct.",
@@ -139,17 +150,22 @@ d88P     888  "Y88888  "Y888 "Y88P"   "Y8888P88 888           888
                         )
                     )
             else:
+                install_error = True
                 click.echo(
                     click.style(
                         "❌ GitHub access token file is empty. Please follow the instructions below to set up your GitHub access token.",
                         fg="red",
                     )
                 )
+                print_access_token_instructions = True
     else:
         # Create the .github_access_token file if it doesn't exist
         with open(".github_access_token", "w") as file:
             file.write("")
+        install_error = True
+        print_access_token_instructions = True
 
+    if print_access_token_instructions:
         # Instructions to set up GitHub access token
         click.echo(
             click.style(
@@ -178,6 +194,14 @@ d88P     888  "Y88888  "Y888 "Y88P"   "Y8888P88 888           888
         click.echo(
             click.style("\t9. Save the file and run the setup command again.", fg="red")
         )
+    if install_error:
+        click.echo(
+            click.style(
+                "\n\n🔴 If you need help, please raise a ticket on GitHub at https://github.com/Significant-Gravitas/Auto-GPT/issues\n\n",
+                fg="magenta",
+                bold=True,
+            )
+        )
 
 
 @cli.group()
diff --git a/setup.sh b/setup.sh
index 20716650c..f7020831e 100755
--- a/setup.sh
+++ b/setup.sh
@@ -24,30 +24,31 @@ fi
 if ! command -v flutter &> /dev/null
 then
     echo "flutter could not be found"
-    echo "Installing flutter..."
-    git clone https://github.com/flutter/flutter.git
-    export PATH="$PATH:`pwd`/flutter/bin"
+    echo "Please install flutter following the instrutions found at https://docs.flutter.dev/get-started/install"
+    exit 1
 fi
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
     if ! command -v google-chrome-stable &> /dev/null
     then
         echo "Google Chrome could not be found"
-        echo "Installing Google Chrome..."
-        wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-        sudo dpkg -i google-chrome-stable_current_amd64.deb
+        echo "Please install Google Chrome manually from https://www.google.com/chrome/"
+        exit 1
     fi
 elif [[ "$OSTYPE" == "darwin"* ]]; then
     if ! command -v /Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome &> /dev/null
     then
         echo "Google Chrome could not be found"
         echo "Please install Google Chrome manually from https://www.google.com/chrome/"
+        exit 1
     fi
 elif [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "win32" ]]; then
     if ! command -v /c/Program\ Files\ \(x86\)/Google/Chrome/Application/chrome.exe &> /dev/null
     then
         echo "Google Chrome could not be found"
         echo "Please install Google Chrome manually from https://www.google.com/chrome/"
+        exit 1
     fi
 else
     echo "Unsupported OS. Please install Google Chrome manually from https://www.google.com/chrome/"
+    exit 1
 fi