testing

forward-ssh.sh

@@ -3,12 +3,6 @@
 # Finds the SSH private key under ./.vagrant and connects to
 # the Vagrant box, port forwarding localhost ports: 8443, 80, 443
 
-# Root check
-if [ "$EUID" -ne 0 ]; then
-  echo "[ERROR]: Please run script as root"
-  exit 1
-fi
-
 # Clean environment
 unset PRIVATE_KEY
 unset HOST_IP
@@ -17,26 +11,16 @@ unset PKILL_ANSWER
 
 # Function to create the SSH tunnel
 function ssh_connect {
-  read -rp "Start a new vagrant SSH tunnel? [y/N]"
+  printf "[INFO]: Starting new vagrant SSH tunnel on PID "
-  echo
+  sudo ssh -fNT -i "$PRIVATE_KEY" \
-  case "$PSTART_ANSWER" in
+    -L 8443:localhost:8443 \
-    [yY])
+    -L 80:localhost:80 \
-      printf "[INFO]: Starting new vagrant SSH tunnel on PID "
+    -L 443:localhost:443 \
-      sudo -u "$USER" ssh -fNT -i "$PRIVATE_KEY" \
+    -o UserKnownHostsFile=/dev/null \
-        -L 8443:localhost:8443 \
+    -o StrictHostKeyChecking=no \
-        -L 80:localhost:80 \
+      vagrant@"$HOST_IP" 2>/dev/null
-        -L 443:localhost:443 \
+  sleep 2
-        -o UserKnownHostsFile=/dev/null \
+  pgrep -f "$MATCH_PATTERN"
-        -o StrictHostKeyChecking=no \
-        vagrant@"$HOST_IP" 2>/dev/null
-      sleep 2
-      pgrep -f "$MATCH_PATTERN"
-      ;;
-    *)
-      echo "[INFO]: Delined to start a new vagrant SSH tunnel"
-      exit 0
-      ;;
-  esac
 }
 
 # Check for valid PRIVATE_KEY location
@@ -72,7 +56,7 @@ else
   case "$PKILL_ANSWER" in
     [yY])
       echo "[WARNING]: Killing old vagrant SSH tunnel(s): "
-      pgrep -f "$MATCH_PATTERN" | tee >(xargs kill -15)
+      pgrep -f "$MATCH_PATTERN" | tee >(xargs sudo kill -15)
       echo
       if [ "$(pgrep -afc "$MATCH_PATTERN")" -eq 0 ]; then
         ssh_connect