From 3d54d68ad472c7c727ab8a6c6bc3041a2ccef816 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Tue, 29 Jul 2025 15:13:05 +0300
Subject: [PATCH] multiple fixes...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 bashctrl    | 14 +++++++++-----
 plugins/env |  1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/bashctrl b/bashctrl
index d7f36f0..9fefea4 100755
--- a/bashctrl
+++ b/bashctrl
@@ -28,6 +28,7 @@ DEFAULT_PLUGINS=(
 	"alias 50 logout"
 
 	"prompt 50 start"
+	"env 50 start"
 )
 
 DISABLED_PLUGINS=(
@@ -39,9 +40,6 @@ DISABLED_PLUGINS=(
 	"bash_completion 99 login"
 	"bash_completion 99 start"
 
-	"env 50 start"
-
-	"bin 90 start"
 )
 
 
@@ -119,6 +117,9 @@ function confirm(){
 # XXX should explicitly check for events...
 function update(){
 	local FILE=$1
+	local NAME=$(basename "$FILE")
+	NAME=${NAME//./}
+	NAME=${NAME^^}
 	local EVT=$2
 	if [ ! -e $FILE ] \
 			|| [ -z "`cat $FILE | grep $SCRIPT`" ] ; then
@@ -126,8 +127,11 @@ function update(){
 			&& echo "  Updating: $FILE..." \
 			|| echo "  Generating: $FILE..."
 		{
-			echo "# Lines added/maintained by $SCRIPT:"
-			echo "source ${BIN_DIR}/${SCRIPT} run $EVT"
+			echo "if [ -z \$BASHCTRL_${NAME} ] ; then"
+			echo "	BASHCTRL_${NAME}=1"
+			echo "	# Lines added/maintained by $SCRIPT:"
+			echo "	source ${BIN_DIR}/${SCRIPT} run $EVT"
+			echo "fi"
 			echo
 		} >> $FILE
 	else
diff --git a/plugins/env b/plugins/env
index 9bc0717..c8a0b75 100644
--- a/plugins/env
+++ b/plugins/env
@@ -1 +1,2 @@
 export HISTCONTROL=ignoredups
+export PATH=~/bin/:$PATH