From de307f43cc47052da97d31a4565643a7d366b819 Mon Sep 17 00:00:00 2001
From: Matthew Adams <matthew.adams@northscaler.com>
Date: Sun, 12 Apr 2020 11:19:35 -0500
Subject: [PATCH 1/2] fix uuid behavior for linux

---
 aliases/available/kubectl.aliases.bash |  2 +-
 aliases/available/uuidgen.aliases.bash | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/aliases/available/kubectl.aliases.bash b/aliases/available/kubectl.aliases.bash
index 0322c931..7022820f 100644
--- a/aliases/available/kubectl.aliases.bash
+++ b/aliases/available/kubectl.aliases.bash
@@ -18,7 +18,7 @@ function _set_pkg_aliases()
     alias kcdn='kubectl describe node'
     alias kcgpan='kubectl get pods --all-namespaces'
     alias kcgdan='kubectl get deployments --all-namespaces'
-    alias kcnetshoot='kubectl run --generator=run-pod/v1 netshoot-$(uuidgen | tr A-Z a-z | sed 's/-//g') --rm -i --tty --image nicolaka/netshoot -- /bin/bash'
+    alias kcnetshoot='kubectl run --generator=run-pod/v1 netshoot-$(date +%s) --rm -i --tty --image nicolaka/netshoot -- /bin/bash'
 	fi
 }
 
diff --git a/aliases/available/uuidgen.aliases.bash b/aliases/available/uuidgen.aliases.bash
index fec5a2b8..a427a4eb 100644
--- a/aliases/available/uuidgen.aliases.bash
+++ b/aliases/available/uuidgen.aliases.bash
@@ -1,6 +1,11 @@
-cite 'uuid-alias'
-about-alias 'uuidgen aliases'
+# cite 'uuid-alias'
+# about-alias 'uuidgen aliases'
 
-alias uuidu="uuidgen"
-alias uuidl="uuidgen | tr '[:upper:]' '[:lower:]'"
-alias uuid=uuidl # because upper case is like YELLING
+if [ "$(uuid 2>/dev/null)" != "" ]; then # Linux
+  alias uuidu="uuid | tr '[:lower:]' '[:upper:]'"
+  alias uuidl=uuid
+elif [ "$(uuidgen 2>/dev/null)" != "" ]; then # macOS/BSD
+  alias uuidu="uuidgen"
+  alias uuid="uuidgen | tr '[:upper:]' '[:lower:]'" # because upper case is like YELLING
+  alias uuidl=uuid
+fi

From c6e76fe4ee4630e132008e4bbe85791b5b056888 Mon Sep 17 00:00:00 2001
From: Matthew Adams <matthew.adams@northscaler.com>
Date: Mon, 13 Apr 2020 07:50:12 -0500
Subject: [PATCH 2/2] address review comments

---
 aliases/available/kubectl.aliases.bash | 10 +++++-----
 aliases/available/uuidgen.aliases.bash |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/aliases/available/kubectl.aliases.bash b/aliases/available/kubectl.aliases.bash
index 7022820f..9ce923a0 100644
--- a/aliases/available/kubectl.aliases.bash
+++ b/aliases/available/kubectl.aliases.bash
@@ -5,12 +5,11 @@
 cite 'about-alias'
 about-alias 'kubectl aliases'
 
-# set apt aliases
 function _set_pkg_aliases()
 {
-	if [ -x $(which kubectl) ]; then
-		alias kc='kubectl'
-		alias kcgp='kubectl get pods'
+  if _command_exists kubectl; then
+    alias kc='kubectl'
+    alias kcgp='kubectl get pods'
     alias kcgd='kubectl get deployments'
     alias kcgn='kubectl get nodes'
     alias kcdp='kubectl describe pod'
@@ -18,8 +17,9 @@ function _set_pkg_aliases()
     alias kcdn='kubectl describe node'
     alias kcgpan='kubectl get pods --all-namespaces'
     alias kcgdan='kubectl get deployments --all-namespaces'
+    # launches a disposable netshoot pod in the k8s cluster
     alias kcnetshoot='kubectl run --generator=run-pod/v1 netshoot-$(date +%s) --rm -i --tty --image nicolaka/netshoot -- /bin/bash'
-	fi
+  fi
 }
 
 _set_pkg_aliases
diff --git a/aliases/available/uuidgen.aliases.bash b/aliases/available/uuidgen.aliases.bash
index a427a4eb..aada05fb 100644
--- a/aliases/available/uuidgen.aliases.bash
+++ b/aliases/available/uuidgen.aliases.bash
@@ -1,10 +1,10 @@
-# cite 'uuid-alias'
-# about-alias 'uuidgen aliases'
+cite 'uuid-alias'
+about-alias 'uuidgen aliases'
 
-if [ "$(uuid 2>/dev/null)" != "" ]; then # Linux
+if _command_exists uuid; then # Linux
   alias uuidu="uuid | tr '[:lower:]' '[:upper:]'"
   alias uuidl=uuid
-elif [ "$(uuidgen 2>/dev/null)" != "" ]; then # macOS/BSD
+elif _command_exists uuidgen; then # macOS/BSD
   alias uuidu="uuidgen"
   alias uuid="uuidgen | tr '[:upper:]' '[:lower:]'" # because upper case is like YELLING
   alias uuidl=uuid