From 8ebbac4659d800ade29e075d88e4b524f8863333 Mon Sep 17 00:00:00 2001
From: mrjk <mrjk.78@gmail.com>
Date: Mon, 4 Jan 2021 22:14:41 -0500
Subject: [PATCH] Add: alias already broken mod by design

---
 lib/idmgr_mod_alias.sh | 51 ++++++++++++++++++++++++++++++++++--------
 shell/bash.sh          |  9 ++++----
 2 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/lib/idmgr_mod_alias.sh b/lib/idmgr_mod_alias.sh
index 647ece6..a1c736f 100644
--- a/lib/idmgr_mod_alias.sh
+++ b/lib/idmgr_mod_alias.sh
@@ -12,13 +12,15 @@ idm_alias__help ()
   echo "Aliases"
   printf "  %-20s: %s\n" "alias virsh" "Start virsh"
   printf "  %-20s: %s\n" "alias virt-manager" "Start virt-manager"
+  printf "  %-20s: %s\n" "alias sshuttle" "Start sshuttle on SSH host"
+  printf "  %-20s: %s\n" "alias sshuttle_ls" "Display net routes on SSH host"
 
-  printf "  %-20s: %s\n" "alias set" "Set alias"
-  printf "  %-20s: %s\n" "alias rm" "Remove alias"
+  #printf "  %-20s: %s\n" "alias set" "Set alias"
+  #printf "  %-20s: %s\n" "alias rm" "Remove alias"
 
-  printf "  %-20s: %s\n" "alias enable" "Enable agent"
-  printf "  %-20s: %s\n" "alias disable" "Disable agent"
-  printf "  %-20s: %s\n" "alias kill" "Kill agent"
+  #printf "  %-20s: %s\n" "alias enable" "Enable agent"
+  #printf "  %-20s: %s\n" "alias disable" "Disable agent"
+  #printf "  %-20s: %s\n" "alias kill" "Kill agent"
 
 #   cat <<EOF
 # 
@@ -66,8 +68,10 @@ idm_alias__ls ()
   local id=$1
   local opt=${2:--l}
 
-  echo "i alias virsh [HOST]"
-  echo "i alias virt_manager [HOST]"
+  echo "i alias virsh HOST"
+  echo "i alias virt_manager HOST"
+  echo "i alias shuttle HOST [NET,...]"
+  echo "i alias shuttle_ls HOST"
 
 }
 
@@ -102,7 +106,7 @@ idm_alias__virsh ()
   local id=$1
   local host=${2-}
 
-  [[ -n "$host" ]] || idm_exit 0 ERR "Missing hostname in command line"
+  [[ -n "$host" ]] || idm_exit 0 ERR "Missing SSH hostname in command line"
   shift 2
 
   local key=$(idm_ssh_search_private_keys "$id" | head -n 1 )
@@ -118,7 +122,7 @@ idm_alias__virt_manager ()
   local id=$1
   local host=${2-}
 
-  [[ -n "$host" ]] || idm_exit 0 ERR "Missing hostname in command line"
+  [[ -n "$host" ]] || idm_exit 0 ERR "Missing SSH hostname in command line"
   shift 2
 
   local key=$(idm_ssh_search_private_keys "$id" | head -n 1 )
@@ -129,3 +133,32 @@ idm_alias__virt_manager ()
   exec $cmd
 }
 
+
+
+idm_alias__sshuttle () 
+{
+  local id=$1
+  local host=${2-}
+
+  [[ -n "$host" ]] || idm_exit 0 ERR "Missing SSH hostname in command line"
+  shift 2
+
+  idm_alias__sshuttle_ls $id $host || true
+
+  local cmd="sshuttle --remote $host --auto-hosts ${@:---auto-nets --dns}"
+  lib_log RUN "$cmd"
+  exec $cmd
+}
+
+idm_alias__sshuttle_ls () 
+{
+  local id=$1
+  local host=${2-}
+
+  [[ -n "$host" ]] || idm_exit 0 ERR "Missing SSH hostname in command line"
+  shift 2
+
+  local cmd="ssh $host ip route"
+  lib_log RUN "$cmd"
+  $cmd
+}
diff --git a/shell/bash.sh b/shell/bash.sh
index 924e7a9..2e1b9c8 100644
--- a/shell/bash.sh
+++ b/shell/bash.sh
@@ -7,18 +7,19 @@ IDM_BIN=${IDM_BIN:-idmgr}
 i ()
 {
 
-  if grep -q ":${1:-NONE}:" <<<"${IDM_SRC_WORDS}"; then
+  if grep -q " ${1:-NONE} " <<<" ${IDM_SRC_WORDS} "; then
 
     result="$( $IDM_BIN $@)"
   
     # Debug module
     if [ "${ID_DEBUG-}" == "true" ]; then
+      echo "DEBUG: Command: $IDM_BIN $@"
       if [ "${result:-NONE}" == "NONE" ]; then
-        echo "======= ${result:-NONE}"
+        echo "DEBUG: ======= ${result:-NONE}"
       else
-        echo ======= Shell has sourced =======
+        echo "DEBUG: ======= Shell has sourced ======="
         echo "${result:-NONE}"
-        echo =======
+        echo "DEBUG: ======="
       fi
     fi