From 2dd707a7eaf675d85762b4b1e9e42f6b315961b1 Mon Sep 17 00:00:00 2001
From: Iskren Chernev <iskren.chernev@gmail.com>
Date: Mon, 13 Apr 2020 14:19:33 +0300
Subject: [PATCH] envkernel.sh: Add reactivate, deactivate on re-source (MR
 1918)

Some users prefer to re-source the script from time to time. Detect that
and deactivate first.
---
 helpers/envkernel.sh | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/helpers/envkernel.sh b/helpers/envkernel.sh
index 49f25855..e8816fb3 100644
--- a/helpers/envkernel.sh
+++ b/helpers/envkernel.sh
@@ -38,6 +38,10 @@ clean_kernel_src_dir() {
 
 
 export_pmbootstrap_dir() {
+	if [ -n "$pmbootstrap_dir" ]; then
+		return 0;
+	fi
+
 	# Get pmbootstrap dir based on this script's location
 	# See also: <https://stackoverflow.com/a/29835459>
 	# shellcheck disable=SC2039
@@ -278,7 +282,9 @@ update_prompt() {
 
 set_deactivate() {
 	cmd="_deactivate() {"
-	cmd="$cmd unalias make kernelroot pmbootstrap pmbroot run-script deactivate;"
+	cmd="$cmd unset POSTMARKETOS_ENVKERNEL_ENABLED;"
+	cmd="$cmd unalias make kernelroot pmbootstrap pmbroot run-script;"
+	cmd="$cmd unalias deactivate reactivate;"
 	cmd="$cmd if [ -n \"\$_OLD_PS1\" ]; then"
 	cmd="$cmd   export PS1=\"\$_OLD_PS1\";"
 	cmd="$cmd   unset _OLD_PS1;"
@@ -293,6 +299,18 @@ set_deactivate() {
 	unset cmd
 }
 
+set_reactivate() {
+	# shellcheck disable=SC2139
+	alias reactivate="deactivate; pushd '$PWD'; . '$pmbootstrap_dir'/helpers/envkernel.sh; popd"
+}
+
+check_and_deactivate() {
+	if [ "$POSTMARKETOS_ENVKERNEL_ENABLED" -eq 1 ]; then
+		# we already are runnning in envkernel
+		deactivate
+	fi
+}
+
 
 print_usage() {
 	# shellcheck disable=SC2039
@@ -347,7 +365,8 @@ parse_args() {
 main() {
 	# Stop executing once a function fails
 	# shellcheck disable=SC1090
-	if check_kernel_folder \
+	if check_and_deactivate \
+		&& check_kernel_folder \
 		&& clean_kernel_src_dir \
 		&& export_pmbootstrap_dir "$1" \
 		&& set_alias_pmbootstrap \
@@ -360,7 +379,10 @@ main() {
 		&& set_alias_make \
 		&& set_alias_pmbroot_kernelroot \
 		&& update_prompt \
-		&& set_deactivate; then
+		&& set_deactivate \
+		&& set_reactivate; then
+
+		POSTMARKETOS_ENVKERNEL_ENABLED=1
 
 		# Success
 		echo "pmbootstrap envkernel.sh activated successfully."