From e75243eef0e06848df0f69c5c3a32311b9235bc1 Mon Sep 17 00:00:00 2001
From: Samuel <36420837+Samueru-sama@users.noreply.github.com>
Date: Tue, 16 Apr 2024 08:54:42 -0400
Subject: [PATCH 1/4] Update APP-MANAGER

---
 APP-MANAGER | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/APP-MANAGER b/APP-MANAGER
index 8af38e515..de878011a 100644
--- a/APP-MANAGER
+++ b/APP-MANAGER
@@ -422,6 +422,21 @@ case "$1" in
 		$SUDOCOMMAND mv "$COMPLETIONFILE" "$COMPLETIONPATH/" 2> /dev/null
 		echo " Completion has been enabled!"
 	fi
+	if [ -f "$HOME/.zshrc" ] || [ -f "$ZDOTDIR/.zshrc" ]; then
+		if [ -n "$ZDOTDIR" ]; then
+    		ZSHDIR="$ZDOTDIR"
+		else
+   	    	ZSHDIR="$HOME"
+		fi
+		echo '#!/usr/bin/env bash' >> "$ZSHDIR/$COMPLETIONFILE"
+		echo 'complete -W "$(cat '"$AMPATH"'/list 2>/dev/null)" '"$AMCLI"'' >> "$ZSHDIR/$COMPLETIONFILE"
+		chmod a+x "$ZSHDIR/$COMPLETIONFILE"
+		echo "
+autoload bashcompinit
+bashcompinit
+source $ZSHDIR/$COMPLETIONFILE" >> "$ZSHDIR/.zshrc"
+
+	fi
 	;;
 
   '--launcher')

From e4d97b7550b96cb0ceb1f7cb2152bdca0cd22e61 Mon Sep 17 00:00:00 2001
From: Samuel <36420837+Samueru-sama@users.noreply.github.com>
Date: Tue, 16 Apr 2024 09:13:41 -0400
Subject: [PATCH 2/4] Update APP-MANAGER

---
 APP-MANAGER | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/APP-MANAGER b/APP-MANAGER
index de878011a..68280c8fb 100644
--- a/APP-MANAGER
+++ b/APP-MANAGER
@@ -428,14 +428,17 @@ case "$1" in
 		else
    	    	ZSHDIR="$HOME"
 		fi
-		echo '#!/usr/bin/env bash' >> "$ZSHDIR/$COMPLETIONFILE"
-		echo 'complete -W "$(cat '"$AMPATH"'/list 2>/dev/null)" '"$AMCLI"'' >> "$ZSHDIR/$COMPLETIONFILE"
-		chmod a+x "$ZSHDIR/$COMPLETIONFILE"
-		echo "
+		if grep -q "source $ZSHDIR/$COMPLETIONFILE" "$ZSHDIR/.zshrc"; then
+			echo "Zsh completion already enabled!"
+		else
+			echo '#!/usr/bin/env bash' >> "$ZSHDIR/$COMPLETIONFILE"
+			echo 'complete -W "$(cat '"$AMPATH"'/list 2>/dev/null)" '"$AMCLI"'' >> "$ZSHDIR/$COMPLETIONFILE"
+			chmod a+x "$ZSHDIR/$COMPLETIONFILE"
+			echo "
 autoload bashcompinit
 bashcompinit
 source $ZSHDIR/$COMPLETIONFILE" >> "$ZSHDIR/.zshrc"
-
+		fi
 	fi
 	;;
 

From 92aadd61ec93f8571a6c740f3cf968f6bcf1dfbd Mon Sep 17 00:00:00 2001
From: iVAN <88724353+ivan-hc@users.noreply.github.com>
Date: Tue, 16 Apr 2024 16:45:34 +0200
Subject: [PATCH 3/4] Update APP-MANAGER: use "echo -e" to patch
 "$ZSHDIR/.zshrc"

---
 APP-MANAGER | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/APP-MANAGER b/APP-MANAGER
index 68280c8fb..502248dd6 100644
--- a/APP-MANAGER
+++ b/APP-MANAGER
@@ -434,10 +434,7 @@ case "$1" in
 			echo '#!/usr/bin/env bash' >> "$ZSHDIR/$COMPLETIONFILE"
 			echo 'complete -W "$(cat '"$AMPATH"'/list 2>/dev/null)" '"$AMCLI"'' >> "$ZSHDIR/$COMPLETIONFILE"
 			chmod a+x "$ZSHDIR/$COMPLETIONFILE"
-			echo "
-autoload bashcompinit
-bashcompinit
-source $ZSHDIR/$COMPLETIONFILE" >> "$ZSHDIR/.zshrc"
+			echo -e "autoload bashcompinit\nbashcompinit\nsource $ZSHDIR/$COMPLETIONFILE" >> "$ZSHDIR/.zshrc"
 		fi
 	fi
 	;;

From 8859d47101d2e662369ebf085f17a218a26386ea Mon Sep 17 00:00:00 2001
From: iVAN <88724353+ivan-hc@users.noreply.github.com>
Date: Tue, 16 Apr 2024 16:45:55 +0200
Subject: [PATCH 4/4] Update APP-MANAGER

---
 APP-MANAGER | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/APP-MANAGER b/APP-MANAGER
index 502248dd6..22b25d9cc 100644
--- a/APP-MANAGER
+++ b/APP-MANAGER
@@ -513,7 +513,7 @@ case "$1" in
 
   'version'|'-v'|'--version')
 
-  	echo "6.5";;
+  	echo "6.5.1";;
 
   *) exec "$AMCLIPATH" ;;