From 1ed551b70bc03911006cbc8a91432eff003d2e00 Mon Sep 17 00:00:00 2001
From: Ava Hahn <a.hahn@f5.com>
Date: Tue, 21 Jan 2025 15:03:43 -0800
Subject: [PATCH] abort vsh rework

Signed-off-by: Ava Hahn <a.hahn@f5.com>
---
 util.sh | 36 ------------------------------------
 virt.sh | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 36 deletions(-)
 delete mode 100644 util.sh

diff --git a/util.sh b/util.sh
deleted file mode 100644
index d3a8332..0000000
--- a/util.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-dirn=$(dirname "$0")
-source $dirn/common.sh
-source $dirn/virt.sh
-source $dirn/nginx.sh
-
-# this file exists to provide logic that requires functionality from one or 
-# more modules in the rest of the code. It can be sourced directly.
-
-function vsh() {
-	if ! turn_on_vm_and_wait $1; then
-		exit 1
-	fi
-
-	sshpass -p $PASSP \
-		ssh -o PreferredAuthentications=password \
-			-o StrictHostKeyChecking=no \
-			$USERN@$(get_vm_ip $1) \
-			"cat > /tmp/u.sh <<EOF
-			 $(typeset WHT)
-			 $(typeset END)
-			 $(typeset -f log)
-			 $(typeset -f num_jobs)
-			 $(typeset -f build_nginx)
-			 $(typeset -f build_otel)
-			 $(typeset -f test_nginx)
-			 $(typeset -f test_otel)
-			 $(typeset -f clean_nginx)
-			 $(typeset -f clean_otel)
-			 EOF
-			 bash"
-
-
-	turn_off_vm $1
-}
diff --git a/virt.sh b/virt.sh
index 027d683..8b75b98 100644
--- a/virt.sh
+++ b/virt.sh
@@ -157,3 +157,18 @@ function vm_cmd() {
 			-o StrictHostKeyChecking=no \
 			$USERN@$(get_vm_ip $1) "$2"
 }
+
+function vsh() {
+	# takes care of error cases
+	if ! turn_on_vm_and_wait $1; then
+		exit 1
+	fi
+
+	get_vm_ip $1
+	sshpass -p $PASSP \
+		ssh -o PreferredAuthentications=password \
+			-o StrictHostKeyChecking=no \
+			$USERN@$ret
+
+	turn_off_vm $1
+}