From ac4b6b31a5126e685168e2db7a997803b8ed3a76 Mon Sep 17 00:00:00 2001
From: Carla Kirk-Cohen <kirkcohenc@gmail.com>
Date: Tue, 16 Apr 2024 13:13:21 -0400
Subject: [PATCH] scripts: use warnet main rather than personal branch

---
 scripts/start_warnet.sh | 11 -----------
 scripts/stop_warnet.sh  |  5 -----
 2 files changed, 16 deletions(-)

diff --git a/scripts/start_warnet.sh b/scripts/start_warnet.sh
index e5423cf..9f46ab2 100755
--- a/scripts/start_warnet.sh
+++ b/scripts/start_warnet.sh
@@ -17,22 +17,11 @@ fi
 
 cd warnet
 
-# Check if the 'carla' remote exists
-if ! git remote | grep -q '^carla$'; then
-    echo "Remote 'carla' does not exist. Adding..."
-    git remote add carla https://github.com/carlaKC/warnet
-fi
-
 if [ -n "$(git status --porcelain)" ]; then
     echo "There are uncommitted changes in warnet, please stash them!"
     exit 1
 fi
 
-echo "Checking out custom branch of warnet"
-echo "TODO: remove me when attackathon/18 has been addressed!"
-git fetch carla > /dev/null 2>&1 || { echo "Failed to fetch carla"; exit 1; }
-git checkout carla/attackathon > /dev/null 2>&1 || { echo "Failed to checkout carla/attackathon"; exit 1; }
-
 # Check whether running docker desktop or minikube.
 docker_info=$(docker info)
 if grep -q "Operating System:.*Desktop" <<< "$docker_info"; then
diff --git a/scripts/stop_warnet.sh b/scripts/stop_warnet.sh
index 06d5612..6796380 100755
--- a/scripts/stop_warnet.sh
+++ b/scripts/stop_warnet.sh
@@ -7,11 +7,6 @@ fi
 
 cd warnet
 
-echo "Removing carla remote"
-echo "TODO: remove me when attackathon/18 has been addressed!"
-git remote remove carla
-git checkout main
-
 docker_info=$(docker info)
 
 # Setup depends on docker or docker desktop.