From 7f5d85f031117dee55f92dbe77698d5f1962f6d3 Mon Sep 17 00:00:00 2001
From: Enzo Arroyo <enzo@arroyof.com>
Date: Wed, 13 Jul 2022 22:34:15 +0200
Subject: [PATCH 1/2] Feature to connect over vagrant servers

Fix in Ansible plugin description
---
 plugins/ansible/ansible.plugin.sh |  4 ++--
 plugins/vagrant/README.md         |  1 +
 plugins/vagrant/vagrant.plugin.sh | 25 +++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/plugins/ansible/ansible.plugin.sh b/plugins/ansible/ansible.plugin.sh
index cf85864..f4336c6 100644
--- a/plugins/ansible/ansible.plugin.sh
+++ b/plugins/ansible/ansible.plugin.sh
@@ -15,7 +15,7 @@ function ansible-role-init(){
     fi
 }
 
-# Alias
+# Aliases
 alias a='ansible '
 alias aconf='ansible-config '
 alias acon='ansible-console '
@@ -26,4 +26,4 @@ alias ainv='ansible-inventory '
 alias adoc='ansible-doc '
 alias agal='ansible-galaxy '
 alias apull='ansible-pull '
-alias aval='ansible-vault'
\ No newline at end of file
+alias aval='ansible-vault'
diff --git a/plugins/vagrant/README.md b/plugins/vagrant/README.md
index dec93e4..be014f8 100644
--- a/plugins/vagrant/README.md
+++ b/plugins/vagrant/README.md
@@ -28,6 +28,7 @@ plugins=(... vagrant)
 | `vat`              | command `vagrant destroy -f`                                 |
 | `vai`              | command `vagrant init -m *[ centos/7 ]*`                     |
 | `varel`            | command `vagrant reload`                                     |
+| `vassh`            | command `vagrant ssh *[ machine1 ]*`                         |
 | `vaba`             | command `vagrant box add`                                    |
 | `vabr`             | command `vagrant box remove`                                 |
 | `vabl`             | command `vagrant box list`                                   |
diff --git a/plugins/vagrant/vagrant.plugin.sh b/plugins/vagrant/vagrant.plugin.sh
index f3ed205..a45c7f8 100644
--- a/plugins/vagrant/vagrant.plugin.sh
+++ b/plugins/vagrant/vagrant.plugin.sh
@@ -1,4 +1,5 @@
 #! bash oh-my-bash.module
+# Author: Enzo Arroyo <enzo@arroyof.com>
 
 # Functions
 function vagrant-version() {
@@ -52,6 +53,29 @@ function vagrant-status() {
     fi
 }
 
+function vagrant-ssh() {
+    local VMCOUNT
+    VMCOUNT="$(vagrant status | grep -c running)"
+    local VMDEFAULT
+    VMDEFAULT="$(vagrant status | grep -w default | grep -c running)"
+
+    if [ "$VMDEFAULT" == 1 ]; then
+        if [[ "$1" ]]; then echo "SKIP : $1 Server...."; fi
+        echo "Login to : default Server...."
+        vagrant ssh
+    elif [[ $1 ]] && [ "$VMCOUNT" -gt 1 ]; then
+        echo "Login to : $1 Server...."
+        vagrant ssh "$1"
+    elif [ "$VMCOUNT" == 0 ]; then
+        echo "Seems like that not there running servers" >&2
+        return 2
+    else
+        echo -e "Please choose some server from this list:\\n"
+        vagrant status | awk '/running/{print $1}'
+        echo -e "\\nThen fill: vagrant ssh [ option ]"
+    fi
+}
+
 
 # Aliases
 alias va='vagrant'
@@ -68,6 +92,7 @@ alias vah='vagrant halt'
 alias vat='vagrant destroy -f'
 alias vai='vagrant-init'
 alias varel='vagrant reload'
+alias vassh='vagrant-ssh'
 alias vaba='vagrant box add'
 alias vabr='vagrant box remove'
 alias vavl='vagrant box list'

From 8c4b4a082469209c89080b115805fbaf6caf6942 Mon Sep 17 00:00:00 2001
From: Koichi Murase <myoga.murase@gmail.com>
Date: Thu, 14 Jul 2022 06:04:13 +0900
Subject: [PATCH 2/2] plugins/vagrant: Ajdust styles

---
 plugins/vagrant/vagrant.plugin.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/plugins/vagrant/vagrant.plugin.sh b/plugins/vagrant/vagrant.plugin.sh
index a45c7f8..af0d6d0 100644
--- a/plugins/vagrant/vagrant.plugin.sh
+++ b/plugins/vagrant/vagrant.plugin.sh
@@ -55,22 +55,24 @@ function vagrant-status() {
 
 function vagrant-ssh() {
     local VMCOUNT
-    VMCOUNT="$(vagrant status | grep -c running)"
+    VMCOUNT=$(vagrant status | grep -c running)
     local VMDEFAULT
-    VMDEFAULT="$(vagrant status | grep -w default | grep -c running)"
+    VMDEFAULT=$(vagrant status | grep -w default | grep -c running)
 
-    if [ "$VMDEFAULT" == 1 ]; then
-        if [[ "$1" ]]; then echo "SKIP : $1 Server...."; fi
+    if ((VMDEFAULT == 1)); then
+        if [[ $1 ]]; then
+            echo "SKIP : $1 Server...."
+        fi
         echo "Login to : default Server...."
         vagrant ssh
-    elif [[ $1 ]] && [ "$VMCOUNT" -gt 1 ]; then
+    elif [[ $1 ]] && ((VMCOUNT > 1)); then
         echo "Login to : $1 Server...."
         vagrant ssh "$1"
-    elif [ "$VMCOUNT" == 0 ]; then
+    elif ((VMCOUNT == 0)); then
         echo "Seems like that not there running servers" >&2
-        return 2
+        return 1
     else
-        echo -e "Please choose some server from this list:\\n"
+        echo -e "Please choose a server from this list:\\n"
         vagrant status | awk '/running/{print $1}'
         echo -e "\\nThen fill: vagrant ssh [ option ]"
     fi