From 26bef84dd387fb3ad69d0d198c3ac571c3cc890e Mon Sep 17 00:00:00 2001
From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com>
Date: Mon, 6 Nov 2023 01:15:16 +0000
Subject: [PATCH] Removed exit code from motd.bash

---
 .../disabled/run_onchange_after_14-gcloud.sh.tmpl              | 2 --
 home/dot_config/shell/bash/motd.bash                           | 1 -
 software.yml                                                   | 3 ++-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/home/.chezmoiscripts/disabled/run_onchange_after_14-gcloud.sh.tmpl b/home/.chezmoiscripts/disabled/run_onchange_after_14-gcloud.sh.tmpl
index 0c4cbf63..5c8bc07e 100644
--- a/home/.chezmoiscripts/disabled/run_onchange_after_14-gcloud.sh.tmpl
+++ b/home/.chezmoiscripts/disabled/run_onchange_after_14-gcloud.sh.tmpl
@@ -12,8 +12,6 @@
 #     - gs://system.s3.{{ .host.domain }}
 #     - gs://user.s3.{{ .host.domain }}
 
-exit 0
-
 if command -v gcloud > /dev/null; then
   if [ -f "${$XDG_CONFIG_HOME:-$HOME/.config}/gcloud/s3-client-secret.json" ]; then
     logg info 'Authenticating with gcloud S3 service account'
diff --git a/home/dot_config/shell/bash/motd.bash b/home/dot_config/shell/bash/motd.bash
index 999f4d87..ef7ad429 100644
--- a/home/dot_config/shell/bash/motd.bash
+++ b/home/dot_config/shell/bash/motd.bash
@@ -215,7 +215,6 @@ print_banner() {
   else
     if command -v neofetch > /dev/null; then
       neofetch
-      exit 0
     fi
   fi
 
diff --git a/software.yml b/software.yml
index a2310546..224877f5 100644
--- a/software.yml
+++ b/software.yml
@@ -6518,7 +6518,7 @@ softwarePackages:
     _name: OWASP ZAP
     _snapClassic: true
     _when:cask: '! test -d "/Applications/OWASP ZAP.app" && ! test -d "$HOME/Applications/OWASP ZAP.app"'
-    cask: owasp-zap
+    cask: zap
     choco: zap
     flatpak: org.zaproxy.ZAP
     pkg-freebsd: zaproxy
@@ -10457,6 +10457,7 @@ softwarePackages:
     _github: https://github.com/wireshark/wireshark
     _home: https://www.wireshark.org/
     _name: Wireshark
+    _pre:cask: if command -v idl2wrs > /dev/null; then brew uninstall wireshark; fi
     _when:cask: '! test -d /Applications/Wireshark.app && ! test -d $HOME/Applications/Wireshark.app'
     apt: wireshark
     cask: