From 9d7fcf8cf4fed5537133c277cdfdad2223dadfa6 Mon Sep 17 00:00:00 2001
From: asubowo <andrew.subowo@gmail.com>
Date: Sat, 20 Apr 2024 16:03:21 -0400
Subject: [PATCH 01/13] broken stuff

---
 .gitignore                                 |  1 +
 README.md                                  |  6 +++
 {tests => bash/tests}/utils/compmd_test.sh |  0
 {tests => bash/tests}/utils/test1.txt      |  0
 {tests => bash/tests}/utils/test2.txt      |  0
 {tests => bash/tests}/utils/test3.txt      |  0
 {tests => bash/tests}/utils/test4.sh       |  0
 bash/utils/background.sh                   | 25 ++++++++++
 {utils => bash/utils}/comphash.sh          |  6 +--
 bash/utils/dialogbuilder.sh                | 14 ++++++
 bash/utils/initdocker.sh                   | 56 ++++++++++++++++++++++
 {utils => bash/utils}/logging.sh           | 14 +++---
 sourcecore.sh                              | 27 +++++++++++
 13 files changed, 138 insertions(+), 11 deletions(-)
 create mode 100644 .gitignore
 rename {tests => bash/tests}/utils/compmd_test.sh (100%)
 rename {tests => bash/tests}/utils/test1.txt (100%)
 rename {tests => bash/tests}/utils/test2.txt (100%)
 rename {tests => bash/tests}/utils/test3.txt (100%)
 rename {tests => bash/tests}/utils/test4.sh (100%)
 create mode 100644 bash/utils/background.sh
 rename {utils => bash/utils}/comphash.sh (82%)
 create mode 100644 bash/utils/dialogbuilder.sh
 create mode 100644 bash/utils/initdocker.sh
 rename {utils => bash/utils}/logging.sh (74%)
 create mode 100755 sourcecore.sh

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..496ee2c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
\ No newline at end of file
diff --git a/README.md b/README.md
index 69a2771..f32e7eb 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,8 @@
 # commonCoreSh
 A collection of Bash scripts/utilities that one can source in their own bash scripts.
+
+# HOW TO USE
+Use at your own direction, so long it is NOT utilized in closed source applications.
+
+Make sure you download the repository as is, and to not change any files in the resulting directories.
+If you want to take advantage of these scripts, source `sourcecore.sh`, or consider sourcing it in your profile.
\ No newline at end of file
diff --git a/tests/utils/compmd_test.sh b/bash/tests/utils/compmd_test.sh
similarity index 100%
rename from tests/utils/compmd_test.sh
rename to bash/tests/utils/compmd_test.sh
diff --git a/tests/utils/test1.txt b/bash/tests/utils/test1.txt
similarity index 100%
rename from tests/utils/test1.txt
rename to bash/tests/utils/test1.txt
diff --git a/tests/utils/test2.txt b/bash/tests/utils/test2.txt
similarity index 100%
rename from tests/utils/test2.txt
rename to bash/tests/utils/test2.txt
diff --git a/tests/utils/test3.txt b/bash/tests/utils/test3.txt
similarity index 100%
rename from tests/utils/test3.txt
rename to bash/tests/utils/test3.txt
diff --git a/tests/utils/test4.sh b/bash/tests/utils/test4.sh
similarity index 100%
rename from tests/utils/test4.sh
rename to bash/tests/utils/test4.sh
diff --git a/bash/utils/background.sh b/bash/utils/background.sh
new file mode 100644
index 0000000..8b66ca7
--- /dev/null
+++ b/bash/utils/background.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+# Author: Andrew Subowo
+# Some common core scripts I use on a day to day basis that I find helpful
+# @_subtype / subtype / 2023
+# To use the functions in this script, merely source it (e.g. source <script aname>)
+# This script allows one to run an array of scripts in the background
+
+# Take in an array or list of arguments with options
+function spinner() {
+
+    COMMAND=$1
+    echo $COMMAND
+    $COMMAND &
+    PID=$!
+    I=1
+    SPIN="/-\|"
+    echo -n ' '
+    while [ -d /proc/$PID ]; do
+        printf "\b${SPIN:I++%${#SPIN}:1}"
+        sleep .1 # DO NOT remove this sleep!
+    done
+    wait $PID
+    return $?
+
+}
\ No newline at end of file
diff --git a/utils/comphash.sh b/bash/utils/comphash.sh
similarity index 82%
rename from utils/comphash.sh
rename to bash/utils/comphash.sh
index 6d37979..9a6c30e 100644
--- a/utils/comphash.sh
+++ b/bash/utils/comphash.sh
@@ -7,13 +7,11 @@
 
 function comphash() {
     if ! command -v md5sum &> /dev/null; then
-        echo "md5sum not installed."
-        exit 1
+        error "md5sum not installed."
     fi
 
     if [ $# -lt 2 ]; then
-        echo "Must pass in at least two arguments."
-        exit 1
+        error "Must pass in at least two arguments."
     else
         # Run bash
         [[ "$(md5sum ${1} | awk '{print $1}')" = "$(md5sum ${2} | awk '{print $1}')" ]] && return 0 || return 1
diff --git a/bash/utils/dialogbuilder.sh b/bash/utils/dialogbuilder.sh
new file mode 100644
index 0000000..cebf36f
--- /dev/null
+++ b/bash/utils/dialogbuilder.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# Author: Andrew Subowo
+# Some common core scripts I use on a day to day basis that I find helpful
+# @_subtype / subtype / 2023
+# To use the functions in this script, merely source it (e.g. source <script aname>)
+# This script assists in quickly building dialog boxes with whiptail or dialog
+
+function check() {
+    if ! command -v whiptail &> /dev/null; then
+        echo "whiptail not installed."
+        exit 1
+    fi
+}
+
diff --git a/bash/utils/initdocker.sh b/bash/utils/initdocker.sh
new file mode 100644
index 0000000..dec8f41
--- /dev/null
+++ b/bash/utils/initdocker.sh
@@ -0,0 +1,56 @@
+#!/bin/bash -
+# Author: Andrew Subowo
+# Some common core scripts I use on a day to day basis that I find helpful
+# @_subtype / subtype / 2024
+# This script will create a Dockerfile, an optional docker-compose.yml, and a couple of utility shell scripts to aid
+
+
+function createBuild() {
+    info "Creating your build scripts"
+    cat << 'EOF' > ./build.sh
+#!/bin/bash
+# Shell script to build image
+docker build . -t
+EOF
+}
+
+function createDockerComposeUtils() {
+    info "Creating your docker-compose utility scripts"
+    cat << 'EOF' > ./buildandrestart.sh
+#!/bin/bash
+# Shell script to run a docker compose build, then restarts your stack, detatched
+docker-compose build && docker-compose down && docker-compose up -d && info "Stack restarted"
+EOF
+}
+
+function createDockerCompose() {
+    info "Creating docker-compose.yml"
+    cat << 'EOF' > ./docker-compose.yml
+version: "3.8"
+
+services:
+    $SERVICE_NAME:
+        build:
+            context: .
+        container_name: $CONTAINER_NAME
+        image: 
+        restart: unless-stopped
+
+EOF
+}
+
+# Main function
+function initdocker() {
+    touch Dockerfile
+
+
+    read -p 'What is the service name?' SERVICE_NAME 
+    read -p 'What is the container name?' CONTAINER_NAME
+
+    createDockerCompose
+
+}
+
+
+
+
diff --git a/utils/logging.sh b/bash/utils/logging.sh
similarity index 74%
rename from utils/logging.sh
rename to bash/utils/logging.sh
index 7210ea8..4b097a4 100644
--- a/utils/logging.sh
+++ b/bash/utils/logging.sh
@@ -9,31 +9,31 @@ RED='\033[0;31m'
 GREEN='\033[0;32m'
 YELLOW='\033[0;33m'
 NORM='\033[0m'
+BFR='\\r\\033[K'
 
 # TODO: For writing to file, allow disabling of TTY coloring to declutter
 # General info
 function info() {
-    echo -e "[INFO] ${1}"
+    echo -ne "[ INFO ] $1"
 }
 
 function ok() {
-    echo -e "[ ${GREEN}OK${NORM} ] $1"
+    echo -e "[  ${GREEN}OK${NORM}  ] $1"
 }
 
 # General warn
 function warn() {
-    echo -e "[${YELLOW}WARN${NORM}] $1"
-    return 2
+    echo -e "[ ${YELLOW}WARN${NORM} ] $1"
 }
 
 # General fatal, returns RC 1
 function fatal() {
-    echo -e "[${RED}FAIL${NORM}] $1"
+    echo -e "[ ${RED}FAIL${NORM} ] $1"
     exit 1
 }
 
 # General error, returns RC of 2
 function error() {
-    echo -e "[${RED}FAIL${NORM}] $1"
-    return 2
+    echo -e "[ ${RED}FAIL${NORM} ] $1"
+    return 1
 }
\ No newline at end of file
diff --git a/sourcecore.sh b/sourcecore.sh
new file mode 100755
index 0000000..f7395fe
--- /dev/null
+++ b/sourcecore.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+# Author: Andrew Subowo
+# Some common core scripts I use on a day to day basis that I find helpful
+# @_subtype / subtype / 2023
+# This script sources the _subtype common core bash library
+
+INITDIR=$(pwd)
+
+trap "cd $INITDIR" EXIT
+
+# Get directory where this file is currently
+SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+cd $SCRIPTPATH
+
+if [ ! -d $SCRIPTPATH/bash ]; then
+    echo "Subtype Common Core Bash library not found"
+fi
+
+if [ -d $SCRIPTPATH/bash/utils ]; then
+    for FILE in $SCRIPTPATH/bash/utils/*; do
+        # Source files in the current shell, not a sub-shell
+        . "$FILE"
+        echo "Sourced $FILE"
+    done
+else
+    echo "Subtype Common Core Bash Utility library not found"
+fi
\ No newline at end of file

From 2ef48088c6e7eb86b473d922e21b72f6e20b418c Mon Sep 17 00:00:00 2001
From: Andrew <andrew.subowo@gmail.com>
Date: Sun, 21 Apr 2024 11:05:19 -0400
Subject: [PATCH 02/13] Updates to utils

---
 README.md                | 13 ++++++-
 bash/utils/comphash.sh   | 19 +++++-----
 bash/utils/initdocker.sh | 77 ++++++++++++++++++++++++++++------------
 bash/utils/logging.sh    |  6 ++--
 sourcecore.sh            | 63 ++++++++++++++++++++++++--------
 5 files changed, 127 insertions(+), 51 deletions(-)

diff --git a/README.md b/README.md
index f32e7eb..54d20f0 100644
--- a/README.md
+++ b/README.md
@@ -5,4 +5,15 @@ A collection of Bash scripts/utilities that one can source in their own bash scr
 Use at your own direction, so long it is NOT utilized in closed source applications.
 
 Make sure you download the repository as is, and to not change any files in the resulting directories.
-If you want to take advantage of these scripts, source `sourcecore.sh`, or consider sourcing it in your profile.
\ No newline at end of file
+If you want to take advantage of these scripts, source `sourcecore.sh`, or consider sourcing it in your profile.
+
+# FEATURES
+
+## comphash
+comphash performs an md5sum comparison between two files. It will not perform this operation if it detects either argument as a directory.
+
+## initdocker
+initdocker creates a skeleton docker 
+
+## logging
+Sourcing the library will let you utilize a couple logging notations in your scripts
\ No newline at end of file
diff --git a/bash/utils/comphash.sh b/bash/utils/comphash.sh
index 9a6c30e..1941e04 100644
--- a/bash/utils/comphash.sh
+++ b/bash/utils/comphash.sh
@@ -6,14 +6,15 @@
 # This script allows one to quickly compare the md5sum of two files together
 
 function comphash() {
-    if ! command -v md5sum &> /dev/null; then
-        error "md5sum not installed."
-    fi
+  if ! command -v md5sum &> /dev/null; then
+    error "md5sum not installed."
+    set +o pipefail
+    return 1
+  fi
 
-    if [ $# -lt 2 ]; then
-        error "Must pass in at least two arguments."
-    else
-        # Run bash
-        [[ "$(md5sum ${1} | awk '{print $1}')" = "$(md5sum ${2} | awk '{print $1}')" ]] && return 0 || return 1
-    fi
+  if [ $# -lt 2 ] || [ $# -gt 2 ]; then
+    error "Must pass in two arguments."
+  else
+    [[ "$(md5sum ${1} ${2} | awk '{print $1}' | uniq | wc -l)" == 1 ]] && return 0 || return 1
+  fi
 }
\ No newline at end of file
diff --git a/bash/utils/initdocker.sh b/bash/utils/initdocker.sh
index dec8f41..930ff38 100644
--- a/bash/utils/initdocker.sh
+++ b/bash/utils/initdocker.sh
@@ -3,52 +3,83 @@
 # Some common core scripts I use on a day to day basis that I find helpful
 # @_subtype / subtype / 2024
 # This script will create a Dockerfile, an optional docker-compose.yml, and a couple of utility shell scripts to aid
+# Let's be honest, if you're familiar with Docker, you probably won't even need these scripts. These scripts may help those who want to 'standardize' a toolchain or process.
 
-
-function createBuild() {
-    info "Creating your build scripts"
-    cat << 'EOF' > ./build.sh
+# Generate dummy build script
+# TODO: Add proper tags
+function createBuildScripts() {
+  info "Creating your build scripts"
+  cat << 'EOF' > ./build.sh
 #!/bin/bash
 # Shell script to build image
-docker build . -t
+docker compose build
 EOF
+
+  chmod 755 ./build.sh
 }
 
 function createDockerComposeUtils() {
-    info "Creating your docker-compose utility scripts"
-    cat << 'EOF' > ./buildandrestart.sh
+  info "Creating your docker-compose utility scripts"
+  cat << 'EOF' > ./buildandrestart.sh
 #!/bin/bash
 # Shell script to run a docker compose build, then restarts your stack, detatched
-docker-compose build && docker-compose down && docker-compose up -d && info "Stack restarted"
+docker compose build && ok "Build successful" && docker compose down && docker compose up -d && info "Stack restarted"
+EOF
+  chmod 755 ./buildandrestart.sh
+
+  info "Creating restart script"
+  cat << 'EOF' > ./restart.sh
+#!/bin/bash
+# Shell script to restart the services defined in the respective compose file
+docker compose down && docker compose up -d && info "Container(s) restarted"
 EOF
+
+  chmod 755 ./restart.sh
 }
 
 function createDockerCompose() {
+  # Don't overwrite an existing compose file
+  if [ -f ./docker-compose.yml ]; then
+    info "A compose file already exists"
+  else
     info "Creating docker-compose.yml"
-    cat << 'EOF' > ./docker-compose.yml
-version: "3.8"
+    cat > ./docker-compose.yml << EOT
+version: "3.9"
 
 services:
-    $SERVICE_NAME:
-        build:
-            context: .
-        container_name: $CONTAINER_NAME
-        image: 
-        restart: unless-stopped
-
-EOF
+  ${SERVICE_NAME}:
+    build:
+      context: .
+    container_name: ${CONTAINER_NAME}
+    image: #your_image_name_here
+    restart: unless-stopped
+EOT
+  unset SERVICE_NAME
+  unset CONTAINER_NAME
+  fi
 }
 
 # Main function
+# quick and dirty
 function initdocker() {
+  if [ ! -f ./Dockerfile ]; then
     touch Dockerfile
+  fi
 
+  if [ ! -z "$1" ]; then
+    SERVICE_NAME=$1
+  else
+    SERVICE_NAME="<service name>"
+  fi
 
-    read -p 'What is the service name?' SERVICE_NAME 
-    read -p 'What is the container name?' CONTAINER_NAME
-
-    createDockerCompose
-
+  if [ ! -z "$2" ]; then
+    CONTAINER_NAME=$2
+  else
+    CONTAINER_NAME="<container name>"
+  fi
+  createDockerCompose
+  createDockerComposeUtils
+  createBuildScripts
 }
 
 
diff --git a/bash/utils/logging.sh b/bash/utils/logging.sh
index 4b097a4..3229a4c 100644
--- a/bash/utils/logging.sh
+++ b/bash/utils/logging.sh
@@ -14,7 +14,7 @@ BFR='\\r\\033[K'
 # TODO: For writing to file, allow disabling of TTY coloring to declutter
 # General info
 function info() {
-    echo -ne "[ INFO ] $1"
+    echo -e "[ INFO ] $1"
 }
 
 function ok() {
@@ -26,13 +26,13 @@ function warn() {
     echo -e "[ ${YELLOW}WARN${NORM} ] $1"
 }
 
-# General fatal, returns RC 1
+# General fatal message. Will exit and return 1
 function fatal() {
     echo -e "[ ${RED}FAIL${NORM} ] $1"
     exit 1
 }
 
-# General error, returns RC of 2
+# General error
 function error() {
     echo -e "[ ${RED}FAIL${NORM} ] $1"
     return 1
diff --git a/sourcecore.sh b/sourcecore.sh
index f7395fe..dbdb01b 100755
--- a/sourcecore.sh
+++ b/sourcecore.sh
@@ -5,23 +5,56 @@
 # This script sources the _subtype common core bash library
 
 INITDIR=$(pwd)
-
 trap "cd $INITDIR" EXIT
-
+VERBOSE=false
 # Get directory where this file is currently
-SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 cd $SCRIPTPATH
 
-if [ ! -d $SCRIPTPATH/bash ]; then
-    echo "Subtype Common Core Bash library not found"
-fi
+function checkUpdate() {
+
+  UPSTREAM=${1:-'@{u}'}
+  LOCAL=$(git rev-parse @)
+  REMOTE=$(git rev-parse "$UPSTREAM")
+  BASE=$(git merge-base @ "$UPSTREAM")
+  if [ $LOCAL = $REMOTE ]; then
+    : # Do nothing no-op
+  elif [ $LOCAL = $BASE ]; then
+    echo "An update is available! Please update the repository via git fetch, then git pull."
+  fi
+}
+
+# main function
+function main() {
+  #checkUpdate
+  if [ ! -d $SCRIPTPATH/bash ]; then
+      echo "_subtype Common Core bash library not found or malformed."
+  fi
+
+  if [ -d $SCRIPTPATH/bash/utils ]; then
+      for FILE in $SCRIPTPATH/bash/utils/*; do
+          # Source files in the current shell, not a sub-shell
+          . "$FILE"
+          if $VERBOSE; then
+            echo "Sourced $FILE"
+          fi
+      done
+  else
+      echo "Bash utils directory not found for sourcing."
+  fi
+}
+
+while getopts "v" OPTS; do
+  case $OPTS in
+    v)
+      VERBOSE=true
+      ;;
+    *)
+      echo "Unsupported option"
+      exit 0
+      ;;
+  esac
+done
 
-if [ -d $SCRIPTPATH/bash/utils ]; then
-    for FILE in $SCRIPTPATH/bash/utils/*; do
-        # Source files in the current shell, not a sub-shell
-        . "$FILE"
-        echo "Sourced $FILE"
-    done
-else
-    echo "Subtype Common Core Bash Utility library not found"
-fi
\ No newline at end of file
+checkUpdate
+main
\ No newline at end of file

From a5d7002a66b115008707964e8b9c3b265aea9de2 Mon Sep 17 00:00:00 2001
From: Andrew <andrew.subowo@gmail.com>
Date: Sun, 21 Apr 2024 11:07:32 -0400
Subject: [PATCH 03/13] rename initdocker to dockerinit

---
 bash/utils/{initdocker.sh => dockerinit.sh} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename bash/utils/{initdocker.sh => dockerinit.sh} (96%)

diff --git a/bash/utils/initdocker.sh b/bash/utils/dockerinit.sh
similarity index 96%
rename from bash/utils/initdocker.sh
rename to bash/utils/dockerinit.sh
index 930ff38..951bf0d 100644
--- a/bash/utils/initdocker.sh
+++ b/bash/utils/dockerinit.sh
@@ -38,6 +38,7 @@ EOF
 }
 
 function createDockerCompose() {
+  info "Initializing a Docker project in this directory"
   # Don't overwrite an existing compose file
   if [ -f ./docker-compose.yml ]; then
     info "A compose file already exists"
@@ -61,7 +62,7 @@ EOT
 
 # Main function
 # quick and dirty
-function initdocker() {
+function dockerinit() {
   if [ ! -f ./Dockerfile ]; then
     touch Dockerfile
   fi

From b6e1159c915fc128f0a59ea4f150c3fef10a0bdb Mon Sep 17 00:00:00 2001
From: Andrew <andrew.subowo@gmail.com>
Date: Sun, 21 Apr 2024 12:02:25 -0400
Subject: [PATCH 04/13] add alias and introduce dutil, a docker compose based
 utility function script

---
 bash/setupshell.sh  |  7 ++++++
 bash/utils/dutil.sh | 58 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 bash/setupshell.sh
 create mode 100644 bash/utils/dutil.sh

diff --git a/bash/setupshell.sh b/bash/setupshell.sh
new file mode 100644
index 0000000..7e8a1fb
--- /dev/null
+++ b/bash/setupshell.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Script to init a shell with some handy aliases, if they haven't already
+
+alias please='sudo'
+alias mkdir='mkdir -pv'
+alias mount='mount | column -t'
+alias showports='netstat -nulpta'
diff --git a/bash/utils/dutil.sh b/bash/utils/dutil.sh
new file mode 100644
index 0000000..945ca26
--- /dev/null
+++ b/bash/utils/dutil.sh
@@ -0,0 +1,58 @@
+#!/bin/bash -
+# Author: Andrew Subowo
+# docker compose based utils -- these can be translated into aliases
+# @_subtype / subtype / 2024
+
+function usage() {
+  echo "usage: dutil [reload|rebuild|networks|ps|psg] [container name]"
+  echo -e "  net|network|networks\n\t\t Returns the list of docker networks"
+  echo -e "  ps|psg\n\t\t If given a container name, perform a search for it. psg performs a grep instead against docker ps -a"
+  echo -e "  rebuild\n\t\t Performs a docker compose down, build, and up, detatched"
+  echo -e "  reload\n\t\t Performs a docker compose down and up, detatched"
+  echo "Part of the _subtype common library"
+  return 2
+}
+
+function dutil() {
+  if [ -z $1 ]; then
+    usage
+    return 2
+  fi
+
+  # TODO: Add v1 support, maybe.
+  if ! docker compose version &> /dev/null; then
+    error "Docker compose v2 is not installed"
+    return 1
+  fi
+
+  case $1 in
+    net|network|networks)
+      docker network ls
+      ;;
+    ps)
+      if [ -z $2 ]; then
+        docker ps -a
+      else
+        docker ps -a -f name=$2
+      fi
+      ;;
+    psg)
+      if [ -z $2 ]; then
+        docker ps -a
+      else
+        docker ps -a | grep $2
+      fi
+      ;;
+    rebuild)
+      #TODO: See if compose file has a build context?
+      docker compose down && docker compose build . && docker compose up -d
+      ;;
+    reload)
+      docker compose down && docker compose up -d
+      ;;
+
+    *)
+      usage
+      ;;
+  esac
+}
\ No newline at end of file

From 52b4a3ec5a18a7e36c632ee9b30f905118da87ce Mon Sep 17 00:00:00 2001
From: Andrew <andrew.subowo@gmail.com>
Date: Sun, 21 Apr 2024 17:17:26 -0400
Subject: [PATCH 05/13] update dutil

---
 README.md                | 14 ++++++++++----
 bash/utils/dockerinit.sh | 42 +++++-----------------------------------
 bash/utils/dutil.sh      | 30 +++++++++++++++++++++++++++-
 sourcecore.sh            | 21 +++++++++++++++++---
 4 files changed, 62 insertions(+), 45 deletions(-)

diff --git a/README.md b/README.md
index 54d20f0..61f0f4a 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,25 @@
 # commonCoreSh
-A collection of Bash scripts/utilities that one can source in their own bash scripts.
+A collection of Bash scripts/utilities that one can source in their own bash scripts. This feature set is currently UNSTABLE and is not recommended for use in production.
 
 # HOW TO USE
 Use at your own direction, so long it is NOT utilized in closed source applications.
 
 Make sure you download the repository as is, and to not change any files in the resulting directories.
-If you want to take advantage of these scripts, source `sourcecore.sh`, or consider sourcing it in your profile.
+If you want to take advantage of these scripts, source `sourcecore.sh`, or consider sourcing it in your profile via `source sourcecore.sh`
 
 # FEATURES
-
 ## comphash
 comphash performs an md5sum comparison between two files. It will not perform this operation if it detects either argument as a directory.
 
+## dutil (docker util)
+The most useful utility so far. Performs some docker compose based actions, such as bouncing a service, building then bouncing, or allowing for easier container ps searching.
+Might be ported over as it's own standalone package. maybe not.
+
+One of the most useful is the shortcut of `dutil shell [container name]`, which does the equivalent of `docker exec -it [container name] /bin/bash`. If the container does not support /bin/bash, it will fallback to using /bin/sh instead.
+
 ## initdocker
-initdocker creates a skeleton docker 
+initdocker creates a couple of Docker files on your behalf, such as a skeleton Compose file, an empty Dockerfile, and some starter Bash scripts.
+If you're intimately familiar with Docker, you probably won't need to use the bash scripts and can rely on the functions `dutil` offers.
 
 ## logging
 Sourcing the library will let you utilize a couple logging notations in your scripts
\ No newline at end of file
diff --git a/bash/utils/dockerinit.sh b/bash/utils/dockerinit.sh
index 951bf0d..985358a 100644
--- a/bash/utils/dockerinit.sh
+++ b/bash/utils/dockerinit.sh
@@ -5,43 +5,10 @@
 # This script will create a Dockerfile, an optional docker-compose.yml, and a couple of utility shell scripts to aid
 # Let's be honest, if you're familiar with Docker, you probably won't even need these scripts. These scripts may help those who want to 'standardize' a toolchain or process.
 
-# Generate dummy build script
-# TODO: Add proper tags
-function createBuildScripts() {
-  info "Creating your build scripts"
-  cat << 'EOF' > ./build.sh
-#!/bin/bash
-# Shell script to build image
-docker compose build
-EOF
-
-  chmod 755 ./build.sh
-}
-
-function createDockerComposeUtils() {
-  info "Creating your docker-compose utility scripts"
-  cat << 'EOF' > ./buildandrestart.sh
-#!/bin/bash
-# Shell script to run a docker compose build, then restarts your stack, detatched
-docker compose build && ok "Build successful" && docker compose down && docker compose up -d && info "Stack restarted"
-EOF
-  chmod 755 ./buildandrestart.sh
-
-  info "Creating restart script"
-  cat << 'EOF' > ./restart.sh
-#!/bin/bash
-# Shell script to restart the services defined in the respective compose file
-docker compose down && docker compose up -d && info "Container(s) restarted"
-EOF
-
-  chmod 755 ./restart.sh
-}
-
 function createDockerCompose() {
-  info "Initializing a Docker project in this directory"
   # Don't overwrite an existing compose file
   if [ -f ./docker-compose.yml ]; then
-    info "A compose file already exists"
+    ok "A compose file already exists"
   else
     info "Creating docker-compose.yml"
     cat > ./docker-compose.yml << EOT
@@ -63,7 +30,10 @@ EOT
 # Main function
 # quick and dirty
 function dockerinit() {
-  if [ ! -f ./Dockerfile ]; then
+  if [ -f ./Dockerfile ]; then
+    ok "A Dockerfile already exists"
+  else  
+    info "Creating Dockerfile"
     touch Dockerfile
   fi
 
@@ -79,8 +49,6 @@ function dockerinit() {
     CONTAINER_NAME="<container name>"
   fi
   createDockerCompose
-  createDockerComposeUtils
-  createBuildScripts
 }
 
 
diff --git a/bash/utils/dutil.sh b/bash/utils/dutil.sh
index 945ca26..d700a43 100644
--- a/bash/utils/dutil.sh
+++ b/bash/utils/dutil.sh
@@ -3,16 +3,23 @@
 # docker compose based utils -- these can be translated into aliases
 # @_subtype / subtype / 2024
 
+# TODO: Figure out how to determine if this was called via source or not or blah blah blah
+# # If this script is interrupted, just return the user to the pwd they were in
+# INITDIR=$(pwd)
+# trap "cd $INITDIR" EXIT
+
 function usage() {
   echo "usage: dutil [reload|rebuild|networks|ps|psg] [container name]"
   echo -e "  net|network|networks\n\t\t Returns the list of docker networks"
   echo -e "  ps|psg\n\t\t If given a container name, perform a search for it. psg performs a grep instead against docker ps -a"
   echo -e "  rebuild\n\t\t Performs a docker compose down, build, and up, detatched"
   echo -e "  reload\n\t\t Performs a docker compose down and up, detatched"
+  echo -e "  shell\n\t\t Runs docker exec -it against a given container name and opens a bash shell (as fallback, use /bin/sh)."
   echo "Part of the _subtype common library"
   return 2
 }
 
+# Main utility function
 function dutil() {
   if [ -z $1 ]; then
     usage
@@ -26,6 +33,14 @@ function dutil() {
   fi
 
   case $1 in
+    init)
+      if ! command -v dockerinit; then
+        error "dockerinit not found. Was the common library sourced correctly?"
+        return 1
+      else 
+        dockerinit
+      fi
+      ;;
     net|network|networks)
       docker network ls
       ;;
@@ -50,7 +65,20 @@ function dutil() {
     reload)
       docker compose down && docker compose up -d
       ;;
-
+    shell)
+      if [ -z $2 ]; then
+        error "A container name must be specified: dutil shell [container name]"
+      else
+        if docker exec $2 /bin/bash > /dev/null 2>&1; then
+          docker exec -it $2 /bin/bash
+        elif docker exec $2 /bin/sh > /dev/null 2>&1; then
+          warn "$2 does not support /bin/bash, using /bin/sh"
+          docker exec -it $2 /bin/sh
+        else
+          error "Unable to spawn shell session for $2"
+        fi
+      fi
+      ;;
     *)
       usage
       ;;
diff --git a/sourcecore.sh b/sourcecore.sh
index dbdb01b..ccac6d1 100755
--- a/sourcecore.sh
+++ b/sourcecore.sh
@@ -4,15 +4,22 @@
 # @_subtype / subtype / 2023
 # This script sources the _subtype common core bash library
 
+# If this script is interrupted, just return the user to the pwd they were in
 INITDIR=$(pwd)
-trap "cd $INITDIR" EXIT
+trap "cleanup; cd $INITDIR" EXIT
+
+# "Verbose" mode
 VERBOSE=false
+
 # Get directory where this file is currently
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 cd $SCRIPTPATH
 
+# Check for updates, don't do any auto update, let the user perform it.
 function checkUpdate() {
-
+  if $VERBOSE; then
+    echo "Checking for updates..."
+  fi
   UPSTREAM=${1:-'@{u}'}
   LOCAL=$(git rev-parse @)
   REMOTE=$(git rev-parse "$UPSTREAM")
@@ -26,7 +33,6 @@ function checkUpdate() {
 
 # main function
 function main() {
-  #checkUpdate
   if [ ! -d $SCRIPTPATH/bash ]; then
       echo "_subtype Common Core bash library not found or malformed."
   fi
@@ -44,6 +50,15 @@ function main() {
   fi
 }
 
+function cleanup() {
+  unset VERBOSE
+  unset SCRIPTPATH
+  unset UPSTREAM
+  unset LOCAL
+  unset REMOTE
+  unset BASE
+}
+
 while getopts "v" OPTS; do
   case $OPTS in
     v)

From 0401cfdbd362282742ee33dcfcdab2251c8062f0 Mon Sep 17 00:00:00 2001
From: Andrew <andrew.subowo@gmail.com>
Date: Sun, 21 Apr 2024 17:45:52 -0400
Subject: [PATCH 06/13] update dutil

---
 bash/bin/README.md           |  3 ++
 bash/bin/dutil_standalone.sh | 93 ++++++++++++++++++++++++++++++++++++
 bash/utils/dutil.sh          |  5 ++
 install.sh                   | 11 +++++
 4 files changed, 112 insertions(+)
 create mode 100644 bash/bin/README.md
 create mode 100755 bash/bin/dutil_standalone.sh
 mode change 100644 => 100755 bash/utils/dutil.sh
 create mode 100755 install.sh

diff --git a/bash/bin/README.md b/bash/bin/README.md
new file mode 100644
index 0000000..52904e0
--- /dev/null
+++ b/bash/bin/README.md
@@ -0,0 +1,3 @@
+Files under this directory get installed into /usr/local/bin
+
+HIGHLY HIGHLY HIGHLY UNSTABLE FOR NOW
\ No newline at end of file
diff --git a/bash/bin/dutil_standalone.sh b/bash/bin/dutil_standalone.sh
new file mode 100755
index 0000000..6a7b68a
--- /dev/null
+++ b/bash/bin/dutil_standalone.sh
@@ -0,0 +1,93 @@
+#!/bin/bash -
+# Author: Andrew Subowo
+# docker compose based utils -- these can be translated into aliases
+# @_subtype / subtype / 2024
+
+# TODO: Figure out how to determine if this was called via source or not or blah blah blah
+# # If this script is interrupted, just return the user to the pwd they were in
+# INITDIR=$(pwd)
+# trap "cd $INITDIR" EXIT
+
+SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && cd .. && pwd )"
+source $SCRIPTPATH/utils/logging.sh
+source $SCRIPTPATH/utils/dockerinit.sh
+
+function usage() {
+  echo "usage: dutil [reload|rebuild|networks|ps|psg] [container name]"
+  echo -e "  net|network|networks\n\t\t Returns the list of docker networks"
+  echo -e "  ps|psg\n\t\t If given a container name, perform a search for it. psg performs a grep instead against docker ps -a"
+  echo -e "  rebuild\n\t\t Performs a docker compose down, build, and up, detatched"
+  echo -e "  reload\n\t\t Performs a docker compose down and up, detatched"
+  echo -e "  shell\n\t\t Runs docker exec -it against a given container name and opens a bash shell (as fallback, use /bin/sh)."
+  echo "Part of the _subtype common library"
+  return 2
+}
+
+# Main utility function
+function dutil() {
+  if [ -z $1 ]; then
+    usage
+    return 2
+  fi
+
+  # TODO: Add v1 support, maybe.
+  if ! docker compose version &> /dev/null; then
+    error "Docker compose v2 is not installed"
+    return 1
+  fi
+
+  case $1 in
+    init)
+      if ! command -v dockerinit; then
+        error "dockerinit not found. Was the common library sourced correctly?"
+        return 1
+      else 
+        dockerinit
+      fi
+      ;;
+    net|network|networks)
+      docker network ls
+      ;;
+    ps)
+      if [ -z $2 ]; then
+        docker ps -a
+      else
+        docker ps -a -f name=$2
+      fi
+      ;;
+    psg)
+      if [ -z $2 ]; then
+        docker ps -a
+      else
+        docker ps -a | grep $2
+      fi
+      ;;
+    rebuild)
+      #TODO: See if compose file has a build context?
+      docker compose down && docker compose build . && docker compose up -d
+      ;;
+    reload)
+      docker compose down && docker compose up -d
+      ;;
+    shell)
+      if [ -z $2 ]; then
+        error "A container name must be specified: dutil shell [container name]"
+      else
+        if docker exec $2 /bin/bash > /dev/null 2>&1; then
+          docker exec -it $2 /bin/bash
+        elif docker exec $2 /bin/sh > /dev/null 2>&1; then
+          warn "$2 does not support /bin/bash, using /bin/sh"
+          docker exec -it $2 /bin/sh
+        else
+          error "Unable to spawn shell session for $2"
+        fi
+      fi
+      ;;
+    *)
+      usage
+      ;;
+  esac
+}
+
+# Disable this stuff
+# dutil "$@" ## HMMMMMMM Need to fix this????? How can I source the common library? Do I install the common lib utils to user space?
\ No newline at end of file
diff --git a/bash/utils/dutil.sh b/bash/utils/dutil.sh
old mode 100644
new mode 100755
index d700a43..c54c42a
--- a/bash/utils/dutil.sh
+++ b/bash/utils/dutil.sh
@@ -19,6 +19,11 @@ function usage() {
   return 2
 }
 
+# Pass onto dutil
+function dutils() {
+  dutil "$@"
+}
+
 # Main utility function
 function dutil() {
   if [ -z $1 ]; then
diff --git a/install.sh b/install.sh
new file mode 100755
index 0000000..ed66721
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+# Author: Andrew Subowo
+# @_subtype / subtype / 2024
+# Installation script to install dutil into /usr/local/bin
+
+echo "Installing dockerutil"
+## TODO: Check for updates?
+
+# Get directory where this file is currently
+SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+cp $SCRIPTPATH/bash/bin/dutil.sh /usr/local/bin/dutil && chmod 755 /usr/local/bin/dutil && echo "Installed as dockerutil" || echo "There was an error installing." && exit 1
\ No newline at end of file

From 4179e1928e69c5857911f65ef1d56dcf807c5484 Mon Sep 17 00:00:00 2001
From: Andrew <andrew.subowo@gmail.com>
Date: Sun, 21 Apr 2024 23:47:51 -0400
Subject: [PATCH 07/13] revamp installer, use symlink

---
 bash/bin/{dutil_standalone.sh => dutil.sh} | 41 +++++++---
 bash/utils/dutil.sh                        | 91 ----------------------
 install.sh                                 |  3 +-
 sourcecore.sh                              | 41 ++++++++--
 4 files changed, 64 insertions(+), 112 deletions(-)
 rename bash/bin/{dutil_standalone.sh => dutil.sh} (71%)
 delete mode 100755 bash/utils/dutil.sh

diff --git a/bash/bin/dutil_standalone.sh b/bash/bin/dutil.sh
similarity index 71%
rename from bash/bin/dutil_standalone.sh
rename to bash/bin/dutil.sh
index 6a7b68a..6dbcd61 100755
--- a/bash/bin/dutil_standalone.sh
+++ b/bash/bin/dutil.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -
+  #!/bin/bash -
 # Author: Andrew Subowo
 # docker compose based utils -- these can be translated into aliases
 # @_subtype / subtype / 2024
@@ -8,9 +8,6 @@
 # INITDIR=$(pwd)
 # trap "cd $INITDIR" EXIT
 
-SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && cd .. && pwd )"
-source $SCRIPTPATH/utils/logging.sh
-source $SCRIPTPATH/utils/dockerinit.sh
 
 function usage() {
   echo "usage: dutil [reload|rebuild|networks|ps|psg] [container name]"
@@ -20,28 +17,49 @@ function usage() {
   echo -e "  reload\n\t\t Performs a docker compose down and up, detatched"
   echo -e "  shell\n\t\t Runs docker exec -it against a given container name and opens a bash shell (as fallback, use /bin/sh)."
   echo "Part of the _subtype common library"
-  return 2
+  exit 1
+}
+
+# Check and source some methods that are included as part of the common core
+function checkAndSourceCommonCore() {
+
+  # Might get rid of this. Let the user have control.
+  if [ ! -h $0 ]; then
+    echo "dutil doesn't seem to be installed as a symbolic link. Please use the provided installer."
+    exit 1
+  fi
+
+  # If the installer was used, the common library should be symlinked/available
+  COMMON_CORE_INSTALL="$( cd $( dirname "$(readlink -f "$0")") && cd ../.. && pwd)"
+  if [ ! -d $COMMON_CORE_INSTALL ]; then
+    echo "Could not locate the common core utils library at $COMMON_CORE_INSTALL"
+    exit 1
+  else
+    . $COMMON_CORE_INSTALL/sourcecore.sh
+  fi
 }
 
 # Main utility function
 function dutil() {
+  checkAndSourceCommonCore
+  CHECK_COMMANDS dockerinit
+
   if [ -z $1 ]; then
     usage
-    return 2
   fi
 
   # TODO: Add v1 support, maybe.
   if ! docker compose version &> /dev/null; then
-    error "Docker compose v2 is not installed"
+    echo "Docker compose v2 is not installed"
     return 1
   fi
 
   case $1 in
     init)
       if ! command -v dockerinit; then
-        error "dockerinit not found. Was the common library sourced correctly?"
+        echo "dockerinit is not present"
         return 1
-      else 
+      else
         dockerinit
       fi
       ;;
@@ -71,7 +89,7 @@ function dutil() {
       ;;
     shell)
       if [ -z $2 ]; then
-        error "A container name must be specified: dutil shell [container name]"
+        usage
       else
         if docker exec $2 /bin/bash > /dev/null 2>&1; then
           docker exec -it $2 /bin/bash
@@ -89,5 +107,4 @@ function dutil() {
   esac
 }
 
-# Disable this stuff
-# dutil "$@" ## HMMMMMMM Need to fix this????? How can I source the common library? Do I install the common lib utils to user space?
\ No newline at end of file
+dutil "$@"
\ No newline at end of file
diff --git a/bash/utils/dutil.sh b/bash/utils/dutil.sh
deleted file mode 100755
index c54c42a..0000000
--- a/bash/utils/dutil.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/bash -
-# Author: Andrew Subowo
-# docker compose based utils -- these can be translated into aliases
-# @_subtype / subtype / 2024
-
-# TODO: Figure out how to determine if this was called via source or not or blah blah blah
-# # If this script is interrupted, just return the user to the pwd they were in
-# INITDIR=$(pwd)
-# trap "cd $INITDIR" EXIT
-
-function usage() {
-  echo "usage: dutil [reload|rebuild|networks|ps|psg] [container name]"
-  echo -e "  net|network|networks\n\t\t Returns the list of docker networks"
-  echo -e "  ps|psg\n\t\t If given a container name, perform a search for it. psg performs a grep instead against docker ps -a"
-  echo -e "  rebuild\n\t\t Performs a docker compose down, build, and up, detatched"
-  echo -e "  reload\n\t\t Performs a docker compose down and up, detatched"
-  echo -e "  shell\n\t\t Runs docker exec -it against a given container name and opens a bash shell (as fallback, use /bin/sh)."
-  echo "Part of the _subtype common library"
-  return 2
-}
-
-# Pass onto dutil
-function dutils() {
-  dutil "$@"
-}
-
-# Main utility function
-function dutil() {
-  if [ -z $1 ]; then
-    usage
-    return 2
-  fi
-
-  # TODO: Add v1 support, maybe.
-  if ! docker compose version &> /dev/null; then
-    error "Docker compose v2 is not installed"
-    return 1
-  fi
-
-  case $1 in
-    init)
-      if ! command -v dockerinit; then
-        error "dockerinit not found. Was the common library sourced correctly?"
-        return 1
-      else 
-        dockerinit
-      fi
-      ;;
-    net|network|networks)
-      docker network ls
-      ;;
-    ps)
-      if [ -z $2 ]; then
-        docker ps -a
-      else
-        docker ps -a -f name=$2
-      fi
-      ;;
-    psg)
-      if [ -z $2 ]; then
-        docker ps -a
-      else
-        docker ps -a | grep $2
-      fi
-      ;;
-    rebuild)
-      #TODO: See if compose file has a build context?
-      docker compose down && docker compose build . && docker compose up -d
-      ;;
-    reload)
-      docker compose down && docker compose up -d
-      ;;
-    shell)
-      if [ -z $2 ]; then
-        error "A container name must be specified: dutil shell [container name]"
-      else
-        if docker exec $2 /bin/bash > /dev/null 2>&1; then
-          docker exec -it $2 /bin/bash
-        elif docker exec $2 /bin/sh > /dev/null 2>&1; then
-          warn "$2 does not support /bin/bash, using /bin/sh"
-          docker exec -it $2 /bin/sh
-        else
-          error "Unable to spawn shell session for $2"
-        fi
-      fi
-      ;;
-    *)
-      usage
-      ;;
-  esac
-}
\ No newline at end of file
diff --git a/install.sh b/install.sh
index ed66721..c38c38d 100755
--- a/install.sh
+++ b/install.sh
@@ -3,9 +3,10 @@
 # @_subtype / subtype / 2024
 # Installation script to install dutil into /usr/local/bin
 
+
 echo "Installing dockerutil"
 ## TODO: Check for updates?
 
 # Get directory where this file is currently
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-cp $SCRIPTPATH/bash/bin/dutil.sh /usr/local/bin/dutil && chmod 755 /usr/local/bin/dutil && echo "Installed as dockerutil" || echo "There was an error installing." && exit 1
\ No newline at end of file
+ln -sf $SCRIPTPATH/bash/bin/dutil.sh /usr/local/bin/dutil && echo "Installed as dockerutil" || echo "There was an error installing." && exit 1
\ No newline at end of file
diff --git a/sourcecore.sh b/sourcecore.sh
index ccac6d1..bf94974 100755
--- a/sourcecore.sh
+++ b/sourcecore.sh
@@ -15,6 +15,31 @@ VERBOSE=false
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 cd $SCRIPTPATH
 
+function CCQUIT() {
+  if [ $# -eq 0 ]; then
+    RC=1 #Default fail state
+  else
+    RC=$1
+  fi
+
+  if [[ "${BASH_SOURCE[0]}" != "${0}" ]]; then
+    # Sourced
+    return $RC
+  else
+    # Not sourced, possibly running in sub-shell
+    exit $RC
+  fi
+}
+
+function CHECK_COMMANDS() {
+    for COMMAND in "$@"; do
+        if ! command -v $COMMAND > /dev/null; then
+            echo "$COMMAND: command not found. Was the _subtype common library properly sourced?"
+            exit 1
+        fi
+    done
+}
+
 # Check for updates, don't do any auto update, let the user perform it.
 function checkUpdate() {
   if $VERBOSE; then
@@ -38,15 +63,15 @@ function main() {
   fi
 
   if [ -d $SCRIPTPATH/bash/utils ]; then
-      for FILE in $SCRIPTPATH/bash/utils/*; do
-          # Source files in the current shell, not a sub-shell
-          . "$FILE"
-          if $VERBOSE; then
-            echo "Sourced $FILE"
-          fi
-      done
+    for FILE in $SCRIPTPATH/bash/utils/*; do
+      # Source files in the current shell, not a sub-shell
+      . "$FILE"
+      if $VERBOSE; then
+        echo "Sourced $FILE"
+      fi
+    done
   else
-      echo "Bash utils directory not found for sourcing."
+    echo "Bash utils directory not found for sourcing."
   fi
 }
 

From 4d25dc6a06e8aa3e644bd68940c711e4430d0fa7 Mon Sep 17 00:00:00 2001
From: Andrew <andrew.subowo@gmail.com>
Date: Mon, 22 Apr 2024 15:31:21 -0400
Subject: [PATCH 08/13] re-organize repo

---
 {bash/bin => bin}/README.md                |  0
 {bash/bin => bin}/dutil.sh                 | 26 +++++++++++++---------
 install.sh                                 |  2 +-
 bash/setupshell.sh => setupshell.sh        |  0
 sourcecore.sh                              | 13 ++---------
 {bash/tests => tests}/utils/compmd_test.sh |  0
 {bash/tests => tests}/utils/test1.txt      |  0
 {bash/tests => tests}/utils/test2.txt      |  0
 {bash/tests => tests}/utils/test3.txt      |  0
 {bash/tests => tests}/utils/test4.sh       |  0
 {bash/utils => utils}/background.sh        |  0
 {bash/utils => utils}/comphash.sh          |  0
 utils/corefunc.sh                          |  8 +++++++
 {bash/utils => utils}/dialogbuilder.sh     |  0
 {bash/utils => utils}/dockerinit.sh        |  0
 {bash/utils => utils}/logging.sh           |  0
 16 files changed, 27 insertions(+), 22 deletions(-)
 rename {bash/bin => bin}/README.md (100%)
 rename {bash/bin => bin}/dutil.sh (77%)
 rename bash/setupshell.sh => setupshell.sh (100%)
 rename {bash/tests => tests}/utils/compmd_test.sh (100%)
 rename {bash/tests => tests}/utils/test1.txt (100%)
 rename {bash/tests => tests}/utils/test2.txt (100%)
 rename {bash/tests => tests}/utils/test3.txt (100%)
 rename {bash/tests => tests}/utils/test4.sh (100%)
 rename {bash/utils => utils}/background.sh (100%)
 rename {bash/utils => utils}/comphash.sh (100%)
 create mode 100644 utils/corefunc.sh
 rename {bash/utils => utils}/dialogbuilder.sh (100%)
 rename {bash/utils => utils}/dockerinit.sh (100%)
 rename {bash/utils => utils}/logging.sh (100%)

diff --git a/bash/bin/README.md b/bin/README.md
similarity index 100%
rename from bash/bin/README.md
rename to bin/README.md
diff --git a/bash/bin/dutil.sh b/bin/dutil.sh
similarity index 77%
rename from bash/bin/dutil.sh
rename to bin/dutil.sh
index 6dbcd61..62d630e 100755
--- a/bash/bin/dutil.sh
+++ b/bin/dutil.sh
@@ -1,4 +1,4 @@
-  #!/bin/bash -
+#!/bin/bash
 # Author: Andrew Subowo
 # docker compose based utils -- these can be translated into aliases
 # @_subtype / subtype / 2024
@@ -20,30 +20,34 @@ function usage() {
   exit 1
 }
 
+# TODO: EVENTUALLY MAKE THIS COMPLETELY STANDALONE(?) Should be able to detect if core is installed or not
 # Check and source some methods that are included as part of the common core
 function checkAndSourceCommonCore() {
 
   # Might get rid of this. Let the user have control.
-  if [ ! -h $0 ]; then
-    echo "dutil doesn't seem to be installed as a symbolic link. Please use the provided installer."
-    exit 1
-  fi
+  # if [ ! -h $0 ]; then
+  #   echo "dutil doesn't seem to be referenced as a symbolic link. Please link $0 to dutil in the library or use the provided installer."
+  #   exit 1
+  # fi
 
   # If the installer was used, the common library should be symlinked/available
-  COMMON_CORE_INSTALL="$( cd $( dirname "$(readlink -f "$0")") && cd ../.. && pwd)"
+  COMMON_CORE_INSTALL="$( cd $(dirname $(dirname "$(readlink -f "$0")"))  && pwd)"
   if [ ! -d $COMMON_CORE_INSTALL ]; then
-    echo "Could not locate the common core utils library at $COMMON_CORE_INSTALL"
+    echo "Could not locate the common core library at $COMMON_CORE_INSTALL. Please consider re-pulling the repository"
     exit 1
   else
-    . $COMMON_CORE_INSTALL/sourcecore.sh
+    source $COMMON_CORE_INSTALL/utils/logging.sh
+    source $COMMON_CORE_INSTALL/utils/corefunc.sh
+    source $COMMON_CORE_INSTALL/utils/dockerinit.sh
   fi
 }
 
 # Main utility function
 function dutil() {
+  # Get current pwd
   checkAndSourceCommonCore
-  CHECK_COMMANDS dockerinit
-
+  CHECK_COMMANDS dockerinit warn ok error
+  
   if [ -z $1 ]; then
     usage
   fi
@@ -92,12 +96,14 @@ function dutil() {
         usage
       else
         if docker exec $2 /bin/bash > /dev/null 2>&1; then
+          ok "Starting /bin/bash in $2"
           docker exec -it $2 /bin/bash
         elif docker exec $2 /bin/sh > /dev/null 2>&1; then
           warn "$2 does not support /bin/bash, using /bin/sh"
           docker exec -it $2 /bin/sh
         else
           error "Unable to spawn shell session for $2"
+          return 1
         fi
       fi
       ;;
diff --git a/install.sh b/install.sh
index c38c38d..def0693 100755
--- a/install.sh
+++ b/install.sh
@@ -9,4 +9,4 @@ echo "Installing dockerutil"
 
 # Get directory where this file is currently
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-ln -sf $SCRIPTPATH/bash/bin/dutil.sh /usr/local/bin/dutil && echo "Installed as dockerutil" || echo "There was an error installing." && exit 1
\ No newline at end of file
+ln -sf $SCRIPTPATH/bin/dutil.sh /usr/local/bin/dutil && echo "Installed as dockerutil" || echo "There was an error installing." && exit 1
\ No newline at end of file
diff --git a/bash/setupshell.sh b/setupshell.sh
similarity index 100%
rename from bash/setupshell.sh
rename to setupshell.sh
diff --git a/sourcecore.sh b/sourcecore.sh
index bf94974..bfa61db 100755
--- a/sourcecore.sh
+++ b/sourcecore.sh
@@ -31,15 +31,6 @@ function CCQUIT() {
   fi
 }
 
-function CHECK_COMMANDS() {
-    for COMMAND in "$@"; do
-        if ! command -v $COMMAND > /dev/null; then
-            echo "$COMMAND: command not found. Was the _subtype common library properly sourced?"
-            exit 1
-        fi
-    done
-}
-
 # Check for updates, don't do any auto update, let the user perform it.
 function checkUpdate() {
   if $VERBOSE; then
@@ -62,8 +53,8 @@ function main() {
       echo "_subtype Common Core bash library not found or malformed."
   fi
 
-  if [ -d $SCRIPTPATH/bash/utils ]; then
-    for FILE in $SCRIPTPATH/bash/utils/*; do
+  if [ -d $SCRIPTPATH/utils ]; then
+    for FILE in $SCRIPTPATH/utils/*; do
       # Source files in the current shell, not a sub-shell
       . "$FILE"
       if $VERBOSE; then
diff --git a/bash/tests/utils/compmd_test.sh b/tests/utils/compmd_test.sh
similarity index 100%
rename from bash/tests/utils/compmd_test.sh
rename to tests/utils/compmd_test.sh
diff --git a/bash/tests/utils/test1.txt b/tests/utils/test1.txt
similarity index 100%
rename from bash/tests/utils/test1.txt
rename to tests/utils/test1.txt
diff --git a/bash/tests/utils/test2.txt b/tests/utils/test2.txt
similarity index 100%
rename from bash/tests/utils/test2.txt
rename to tests/utils/test2.txt
diff --git a/bash/tests/utils/test3.txt b/tests/utils/test3.txt
similarity index 100%
rename from bash/tests/utils/test3.txt
rename to tests/utils/test3.txt
diff --git a/bash/tests/utils/test4.sh b/tests/utils/test4.sh
similarity index 100%
rename from bash/tests/utils/test4.sh
rename to tests/utils/test4.sh
diff --git a/bash/utils/background.sh b/utils/background.sh
similarity index 100%
rename from bash/utils/background.sh
rename to utils/background.sh
diff --git a/bash/utils/comphash.sh b/utils/comphash.sh
similarity index 100%
rename from bash/utils/comphash.sh
rename to utils/comphash.sh
diff --git a/utils/corefunc.sh b/utils/corefunc.sh
new file mode 100644
index 0000000..04eba17
--- /dev/null
+++ b/utils/corefunc.sh
@@ -0,0 +1,8 @@
+function CHECK_COMMANDS() {
+    for COMMAND in "$@"; do
+        if ! command -v $COMMAND > /dev/null; then
+            echo "$COMMAND: command not found. Was the _subtype common library properly sourced?"
+            exit 1
+        fi
+    done
+}
\ No newline at end of file
diff --git a/bash/utils/dialogbuilder.sh b/utils/dialogbuilder.sh
similarity index 100%
rename from bash/utils/dialogbuilder.sh
rename to utils/dialogbuilder.sh
diff --git a/bash/utils/dockerinit.sh b/utils/dockerinit.sh
similarity index 100%
rename from bash/utils/dockerinit.sh
rename to utils/dockerinit.sh
diff --git a/bash/utils/logging.sh b/utils/logging.sh
similarity index 100%
rename from bash/utils/logging.sh
rename to utils/logging.sh

From 3e6f39734ea55750b39ffec0f870dec93933eead Mon Sep 17 00:00:00 2001
From: Andrew <andrew.subowo@gmail.com>
Date: Mon, 22 Apr 2024 15:43:43 -0400
Subject: [PATCH 09/13] updates

---
 bin/dutil.sh               |  6 ++++++
 install.sh                 | 12 ++++++++++--
 setupshell.sh              |  0
 tests/utils/compmd_test.sh |  6 ++++++
 utils/corefunc.sh          |  5 +++++
 5 files changed, 27 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 setupshell.sh

diff --git a/bin/dutil.sh b/bin/dutil.sh
index 62d630e..1637251 100755
--- a/bin/dutil.sh
+++ b/bin/dutil.sh
@@ -84,6 +84,8 @@ function dutil() {
         docker ps -a | grep $2
       fi
       ;;
+    
+    
     rebuild)
       #TODO: See if compose file has a build context?
       docker compose down && docker compose build . && docker compose up -d
@@ -93,6 +95,7 @@ function dutil() {
       ;;
     shell)
       if [ -z $2 ]; then
+        error "Missing container name"
         usage
       else
         if docker exec $2 /bin/bash > /dev/null 2>&1; then
@@ -107,6 +110,9 @@ function dutil() {
         fi
       fi
       ;;
+    upgrade)
+      docker compose down && docker compose pull && docker compose up -d && ok "Complete"
+      ;;
     *)
       usage
       ;;
diff --git a/install.sh b/install.sh
index def0693..61d05ba 100755
--- a/install.sh
+++ b/install.sh
@@ -4,9 +4,17 @@
 # Installation script to install dutil into /usr/local/bin
 
 
-echo "Installing dockerutil"
+echo "Installing docker utilities"
 ## TODO: Check for updates?
 
 # Get directory where this file is currently
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-ln -sf $SCRIPTPATH/bin/dutil.sh /usr/local/bin/dutil && echo "Installed as dockerutil" || echo "There was an error installing." && exit 1
\ No newline at end of file
+ln -sf $SCRIPTPATH/bin/dutil.sh /usr/local/bin/dutil && echo "Installed as dutil" || echo "There was an error creating the symlink" && exit 1
+
+echo "Running aliases"
+
+if [[ -x $SCRIPTPATH/setupshell.sh ]]; then
+    $SCRIPTPATH/setupshell.sh
+else
+    echo "Couldn't find the setupshell script, or the file isn't executable"
+fi
\ No newline at end of file
diff --git a/setupshell.sh b/setupshell.sh
old mode 100644
new mode 100755
diff --git a/tests/utils/compmd_test.sh b/tests/utils/compmd_test.sh
index 757aecf..2bac5f3 100755
--- a/tests/utils/compmd_test.sh
+++ b/tests/utils/compmd_test.sh
@@ -19,14 +19,20 @@ source ../../utils/logging.sh
 echo "Testing file comparison, shell, empty"
 if comphash ./test1.txt ./test2.txt; then
     ok
+else
+    fail
 fi
 
 echo "Testing file comparison, shell, differing"
 if ! comphash ./test1.txt ./test3.txt; then
     ok
+else
+    fail
 fi
 
 echo "Testing two files with different extensions"
 if comphash ./test1.txt ./test4.sh; then
     ok
+else
+    fail
 fi
\ No newline at end of file
diff --git a/utils/corefunc.sh b/utils/corefunc.sh
index 04eba17..222c2b7 100644
--- a/utils/corefunc.sh
+++ b/utils/corefunc.sh
@@ -1,3 +1,8 @@
+#!/bin/bash
+# Author: Andrew Subowo
+# Some helper functions for the installation
+# @_subtype / subtype / 2024
+
 function CHECK_COMMANDS() {
     for COMMAND in "$@"; do
         if ! command -v $COMMAND > /dev/null; then

From c1c079a67ef191a09b591fd09f62e097b252cd3e Mon Sep 17 00:00:00 2001
From: Andrew <andrew.subowo@gmail.com>
Date: Tue, 23 Apr 2024 10:42:17 -0400
Subject: [PATCH 10/13] update to dockerinit

---
 bin/dutil.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bin/dutil.sh b/bin/dutil.sh
index 1637251..79e7301 100755
--- a/bin/dutil.sh
+++ b/bin/dutil.sh
@@ -60,7 +60,7 @@ function dutil() {
 
   case $1 in
     init)
-      if ! command -v dockerinit; then
+      if ! command -v dockerinit &> /dev/null; then
         echo "dockerinit is not present"
         return 1
       else
@@ -83,9 +83,7 @@ function dutil() {
       else
         docker ps -a | grep $2
       fi
-      ;;
-    
-    
+      ;;    
     rebuild)
       #TODO: See if compose file has a build context?
       docker compose down && docker compose build . && docker compose up -d

From 1017dd699adbe7749a051bbac7e25bf456e31ec9 Mon Sep 17 00:00:00 2001
From: Andrew <andrew.subowo@gmail.com>
Date: Tue, 23 Apr 2024 12:40:15 -0400
Subject: [PATCH 11/13] Some more updates

---
 bin/dutil.sh | 12 +++---------
 install.sh   |  4 ++--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/bin/dutil.sh b/bin/dutil.sh
index 79e7301..c209034 100755
--- a/bin/dutil.sh
+++ b/bin/dutil.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Author: Andrew Subowo
-# docker compose based utils -- these can be translated into aliases
+# docker compose based utils -- these can be translated into aliases. It's not that fancy.
 # @_subtype / subtype / 2024
 
 # TODO: Figure out how to determine if this was called via source or not or blah blah blah
@@ -17,19 +17,13 @@ function usage() {
   echo -e "  reload\n\t\t Performs a docker compose down and up, detatched"
   echo -e "  shell\n\t\t Runs docker exec -it against a given container name and opens a bash shell (as fallback, use /bin/sh)."
   echo "Part of the _subtype common library"
-  exit 1
+  exit 2
 }
 
 # TODO: EVENTUALLY MAKE THIS COMPLETELY STANDALONE(?) Should be able to detect if core is installed or not
+# Shouldn't have to enforce utilization of the common core, but eh
 # Check and source some methods that are included as part of the common core
 function checkAndSourceCommonCore() {
-
-  # Might get rid of this. Let the user have control.
-  # if [ ! -h $0 ]; then
-  #   echo "dutil doesn't seem to be referenced as a symbolic link. Please link $0 to dutil in the library or use the provided installer."
-  #   exit 1
-  # fi
-
   # If the installer was used, the common library should be symlinked/available
   COMMON_CORE_INSTALL="$( cd $(dirname $(dirname "$(readlink -f "$0")"))  && pwd)"
   if [ ! -d $COMMON_CORE_INSTALL ]; then
diff --git a/install.sh b/install.sh
index 61d05ba..f412ff8 100755
--- a/install.sh
+++ b/install.sh
@@ -4,9 +4,9 @@
 # Installation script to install dutil into /usr/local/bin
 
 
+# Install dutil via a symlink to ./bin/dutil.sh is here. That way we can also sorta kinda maybe import the other helper utils
 echo "Installing docker utilities"
 ## TODO: Check for updates?
-
 # Get directory where this file is currently
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 ln -sf $SCRIPTPATH/bin/dutil.sh /usr/local/bin/dutil && echo "Installed as dutil" || echo "There was an error creating the symlink" && exit 1
@@ -14,7 +14,7 @@ ln -sf $SCRIPTPATH/bin/dutil.sh /usr/local/bin/dutil && echo "Installed as dutil
 echo "Running aliases"
 
 if [[ -x $SCRIPTPATH/setupshell.sh ]]; then
-    $SCRIPTPATH/setupshell.sh
+    ./$SCRIPTPATH/setupshell.sh
 else
     echo "Couldn't find the setupshell script, or the file isn't executable"
 fi
\ No newline at end of file

From def86980c5529689fe8f949a4e7ecba8360362cd Mon Sep 17 00:00:00 2001
From: Andrew <andrew.subowo@gmail.com>
Date: Tue, 23 Apr 2024 12:45:03 -0400
Subject: [PATCH 12/13] Disable aliases

---
 bin/dutil.sh |  1 +
 install.sh   | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/bin/dutil.sh b/bin/dutil.sh
index c209034..15abb1c 100755
--- a/bin/dutil.sh
+++ b/bin/dutil.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 # Author: Andrew Subowo
 # docker compose based utils -- these can be translated into aliases. It's not that fancy.
+# These are things that I somewhat do on a more frequent basis.
 # @_subtype / subtype / 2024
 
 # TODO: Figure out how to determine if this was called via source or not or blah blah blah
diff --git a/install.sh b/install.sh
index f412ff8..eb781b8 100755
--- a/install.sh
+++ b/install.sh
@@ -11,10 +11,11 @@ echo "Installing docker utilities"
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 ln -sf $SCRIPTPATH/bin/dutil.sh /usr/local/bin/dutil && echo "Installed as dutil" || echo "There was an error creating the symlink" && exit 1
 
-echo "Running aliases"
+# Not going to fix this right now
+# echo "Running aliases"
 
-if [[ -x $SCRIPTPATH/setupshell.sh ]]; then
-    ./$SCRIPTPATH/setupshell.sh
-else
-    echo "Couldn't find the setupshell script, or the file isn't executable"
-fi
\ No newline at end of file
+# if [[ -x $SCRIPTPATH/setupshell.sh ]]; then
+#     . $SCRIPTPATH/setupshell.sh
+# else
+#     echo "Couldn't find the setupshell script, or the file isn't executable"
+# fi
\ No newline at end of file

From 7c2cf330f5546ea35511f7aa99371094a82355d0 Mon Sep 17 00:00:00 2001
From: asubowo <andrew.subowo@gmail.com>
Date: Sun, 16 Mar 2025 14:23:13 -0400
Subject: [PATCH 13/13] updates - convert dutil to go binary

---
 README.md           |   5 --
 bin/dutil.go        | 159 ++++++++++++++++++++++++++++++++++++++++++++
 bin/dutil.sh        |   9 ++-
 install.sh          |   3 +-
 utils/dockerinit.sh |   4 +-
 5 files changed, 170 insertions(+), 10 deletions(-)
 create mode 100644 bin/dutil.go

diff --git a/README.md b/README.md
index 530c982..03628e6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # commonCoreSh
 A collection of Bash scripts/utilities that one can source in their own bash scripts. This feature set is currently UNSTABLE and is not recommended for use in production.
 
@@ -24,7 +23,3 @@ If you're intimately familiar with Docker, you probably won't need to use the ba
 
 ## logging
 Sourcing the library will let you utilize a couple logging notations in your scripts
-=======
-# commonCore
-A collection of Bash scripts/utilities that one can source in their own bash scripts.
->>>>>>> main
diff --git a/bin/dutil.go b/bin/dutil.go
new file mode 100644
index 0000000..48124fc
--- /dev/null
+++ b/bin/dutil.go
@@ -0,0 +1,159 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"strings"
+)
+
+func main() {
+	if len(os.Args) < 2 {
+		usage()
+		os.Exit(2)
+	}
+
+	// Check if docker compose is installed
+	if _, err := exec.Command("docker", "compose", "version").CombinedOutput(); err != nil {
+		fmt.Println("Docker compose v2 is not installed")
+		os.Exit(1)
+	}
+
+	command := os.Args[1]
+	switch command {
+	case "net", "network", "networks":
+		runCommand("docker", "network", "ls")
+
+	case "ps":
+		if len(os.Args) < 3 {
+			runCommand("docker", "ps", "-a")
+		} else {
+			containerName := os.Args[2]
+			runCommand("docker", "ps", "-a", "-f", "name="+containerName)
+		}
+
+	case "psg":
+		if len(os.Args) < 3 {
+			runCommand("docker", "ps", "-a")
+		} else {
+			searchTerm := os.Args[2]
+			output, err := exec.Command("docker", "ps", "-a").Output()
+			if err != nil {
+				fmt.Println("Error:", err)
+				os.Exit(1)
+			}
+			
+			lines := strings.Split(string(output), "\n")
+			for _, line := range lines {
+				if strings.Contains(line, searchTerm) {
+					fmt.Println(line)
+				}
+			}
+		}
+
+	case "rebuild":
+		runCommandSequence(
+			[]string{"docker", "compose", "down"},
+			[]string{"docker", "compose", "build", "."},
+			[]string{"docker", "compose", "up", "-d"},
+		)
+
+	case "reload":
+		composeFile := ""
+		if len(os.Args) > 2 {
+			composeFile = os.Args[2]
+			runCommandSequence(
+				[]string{"docker", "compose", "-f", composeFile, "down"},
+				[]string{"docker", "compose", "-f", composeFile, "up", "-d"},
+			)
+		} else {
+			runCommandSequence(
+				[]string{"docker", "compose", "down"},
+				[]string{"docker", "compose", "up", "-d"},
+			)
+		}
+
+	case "shell":
+		if len(os.Args) < 3 {
+			usage()
+			fmt.Println("Error: Missing container name")
+			os.Exit(1)
+		}
+		
+		containerName := os.Args[2]
+		// Try bash first
+		cmd := exec.Command("docker", "exec", containerName, "/bin/bash")
+		if err := cmd.Run(); err == nil {
+			fmt.Println("Starting /bin/bash in", containerName)
+			runInteractiveCommand("docker", "exec", "-it", containerName, "/bin/bash")
+		} else {
+			// Try sh as fallback
+			cmd = exec.Command("docker", "exec", containerName, "/bin/sh")
+			if err := cmd.Run(); err == nil {
+				fmt.Println("Warning:", containerName, "does not support /bin/bash, using /bin/sh")
+				runInteractiveCommand("docker", "exec", "-it", containerName, "/bin/sh")
+			} else {
+				fmt.Println("Error: Unable to spawn shell session for", containerName)
+				os.Exit(1)
+			}
+		}
+
+	case "upgrade":
+		runCommandSequence(
+			[]string{"docker", "compose", "down"},
+			[]string{"docker", "compose", "pull"},
+			[]string{"docker", "compose", "up", "-d"},
+		)
+		fmt.Println("Complete")
+
+	default:
+		usage()
+		os.Exit(2)
+	}
+}
+
+func usage() {
+	fmt.Println("usage: dutil [reload|rebuild|networks|ps|psg] [container name]")
+	fmt.Println("  net|network|networks\n\t\t Returns the list of docker networks")
+	fmt.Println("  ps|psg\n\t\t If given a container name, perform a search for it. psg performs a grep instead against docker ps -a")
+	fmt.Println("  rebuild\n\t\t Performs a docker compose down, build, and up, detatched")
+	fmt.Println("  reload\n\t\t Performs a docker compose down and up, detatched")
+	fmt.Println("  shell\n\t\t Runs docker exec -it against a given container name and opens a bash shell (as fallback, use /bin/sh).")
+	fmt.Println("Part of the _subtype common library")
+}
+
+func runCommand(command string, args ...string) {
+	cmd := exec.Command(command, args...)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	
+	if err := cmd.Run(); err != nil {
+		fmt.Println("Error executing command:", err)
+		os.Exit(1)
+	}
+}
+
+func runInteractiveCommand(command string, args ...string) {
+	cmd := exec.Command(command, args...)
+	cmd.Stdin = os.Stdin
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	
+	if err := cmd.Run(); err != nil {
+		fmt.Println("Error executing interactive command:", err)
+		os.Exit(1)
+	}
+}
+
+func runCommandSequence(commands ...[]string) {
+	for _, cmdArgs := range commands {
+		cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...)
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		
+		if err := cmd.Run(); err != nil {
+			fmt.Println("Error executing command sequence:", err)
+			os.Exit(1)
+		}
+	}
+}
\ No newline at end of file
diff --git a/bin/dutil.sh b/bin/dutil.sh
index 15abb1c..f94ceaf 100755
--- a/bin/dutil.sh
+++ b/bin/dutil.sh
@@ -38,6 +38,7 @@ function checkAndSourceCommonCore() {
 }
 
 # Main utility function
+# Wrap it all into a function in case someone somehow partially downloads the file
 function dutil() {
   # Get current pwd
   checkAndSourceCommonCore
@@ -84,12 +85,16 @@ function dutil() {
       docker compose down && docker compose build . && docker compose up -d
       ;;
     reload)
-      docker compose down && docker compose up -d
+      if [ ! -z $2 ]; then #docker compose up and down a given service
+        docker compose -f $2 down && docker compose -f $2 up -d
+      else
+        docker compose down && docker compose up -d
+      fi
       ;;
     shell)
       if [ -z $2 ]; then
-        error "Missing container name"
         usage
+        error "Missing container name"
       else
         if docker exec $2 /bin/bash > /dev/null 2>&1; then
           ok "Starting /bin/bash in $2"
diff --git a/install.sh b/install.sh
index eb781b8..df04d60 100755
--- a/install.sh
+++ b/install.sh
@@ -6,10 +6,11 @@
 
 # Install dutil via a symlink to ./bin/dutil.sh is here. That way we can also sorta kinda maybe import the other helper utils
 echo "Installing docker utilities"
+echo "Creating 'dutil' symlink under /usr/local/bin"
 ## TODO: Check for updates?
 # Get directory where this file is currently
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-ln -sf $SCRIPTPATH/bin/dutil.sh /usr/local/bin/dutil && echo "Installed as dutil" || echo "There was an error creating the symlink" && exit 1
+ln -sf $SCRIPTPATH/bin/dutil.sh /usr/local/bin/dutil && echo "Installed as dutil under /usr/local/bin/dutil" || echo "There was an error creating the symlink" && exit 1
 
 # Not going to fix this right now
 # echo "Running aliases"
diff --git a/utils/dockerinit.sh b/utils/dockerinit.sh
index 985358a..cbc2c67 100644
--- a/utils/dockerinit.sh
+++ b/utils/dockerinit.sh
@@ -8,7 +8,7 @@
 function createDockerCompose() {
   # Don't overwrite an existing compose file
   if [ -f ./docker-compose.yml ]; then
-    ok "A compose file already exists"
+    ok "A compose file already exists in this location."
   else
     info "Creating docker-compose.yml"
     cat > ./docker-compose.yml << EOT
@@ -31,7 +31,7 @@ EOT
 # quick and dirty
 function dockerinit() {
   if [ -f ./Dockerfile ]; then
-    ok "A Dockerfile already exists"
+    ok "A Dockerfile already exists in this location."
   else  
     info "Creating Dockerfile"
     touch Dockerfile