From: xtex <xtexchooser@duck.com>

Signed-off-by: xtex <xtexchooser@duck.com>
---
 helpers/envkernel.fish | 1 +
 1 file changed, 1 insertion(+)

diff --git a/helpers/envkernel.fish b/helpers/envkernel.fish
index f3b980cc..5dcc6e13 100644
--- a/helpers/envkernel.fish
+++ b/helpers/envkernel.fish
@@ -17,6 +17,7 @@ end
 # Fish compatibility code from envkernel.sh
 set script_dir (dirname (status filename))
 sh "$script_dir/envkernel.sh" $argv --fish 1>| read -z fishcode
+set pmbootstrap_dir (realpath "$script_dir/..")
 
 # Verbose output (enable with: 'set ENVKERNEL_FISH_VERBOSE 1')
 if [ "$ENVKERNEL_FISH_VERBOSE" = "1" ]
-- 
2.43.0

From: xtex <xtexchooser@duck.com>

Signed-off-by: xtex <xtexchooser@duck.com>
---
 helpers/envkernel.fish | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/helpers/envkernel.fish b/helpers/envkernel.fish
index 5dcc6e13..78fc4a01 100644
--- a/helpers/envkernel.fish
+++ b/helpers/envkernel.fish
@@ -28,3 +28,15 @@ end
 
 # Execute generated code
 echo -e "$fishcode" | source -
+
+# Set prompt
+if test -z "$ENVKERNEL_DISABLE_PROMPT"
+    functions -c fish_prompt _old_fish_prompt
+
+    function fish_prompt
+        set -l old_status $status
+        printf "[envkernel] "
+        echo "exit $old_status" | .
+        _old_fish_prompt
+    end
+end
-- 
2.43.0

From: xtex <xtexchooser@duck.com>

Signed-off-by: xtex <xtexchooser@duck.com>
---
 helpers/envkernel.fish | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/helpers/envkernel.fish b/helpers/envkernel.fish
index 78fc4a01..46bc96c3 100644
--- a/helpers/envkernel.fish
+++ b/helpers/envkernel.fish
@@ -40,3 +40,17 @@ if test -z "$ENVKERNEL_DISABLE_PROMPT"
         _old_fish_prompt
     end
 end
+
+# Deactivate
+function deactivate
+	if functions -q _old_fish_prompt
+		functions -e fish_prompt
+		functions -c _old_fish_prompt fish_prompt
+		functions -e _old_fish_prompt
+	end
+	functions -e make kernelroot pmbootstrap pmbroot
+	functions -e deactivate reactivate
+end
+
+# Reactivate
+alias reactivate "deactivate; pushd '$PWD'; . '$pmbootstrap_dir'/helpers/envkernel.fish; popd"
-- 
2.43.0

On Sat Jan 13, 2024 at 12:33 PM UTC, xtex wrote:
> From: xtex <xtexchooser@duck.com>
>

All patches form this series look good to me, thanks!

Reviewed-by: Oliver Smith <ollieparanoid@postmarketos.org>

> Signed-off-by: xtex <xtexchooser@duck.com>
> ---
>  helpers/envkernel.fish | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/helpers/envkernel.fish b/helpers/envkernel.fish
> index f3b980cc..5dcc6e13 100644
> --- a/helpers/envkernel.fish
> +++ b/helpers/envkernel.fish
> @@ -17,6 +17,7 @@ end
>  # Fish compatibility code from envkernel.sh
>  set script_dir (dirname (status filename))
>  sh "$script_dir/envkernel.sh" $argv --fish 1>| read -z fishcode
> +set pmbootstrap_dir (realpath "$script_dir/..")
>  
>  # Verbose output (enable with: 'set ENVKERNEL_FISH_VERBOSE 1')
>  if [ "$ENVKERNEL_FISH_VERBOSE" = "1" ]

On Sat, 13 Jan 2024 20:33:56 +0800, xtex wrote:
> From: xtex <xtexchooser@duck.com>
> 
> 

Applied, thanks!

[1/3] helpers/envkernel.fish: export pmbootstrap_dir
      commit: 81fff2c6d6ad3d566641ad4942578365b6cdf234
[2/3] helpers/envkernel.fish: set prompt prefix in fish-shell
      commit: fc3d8b06b338a41605ab6e340e923158f5d2e9d2
[3/3] helpers/envkernel.fish: add deactivate & reactivate function for fish
      commit: 59898f515ac5e70e194b7b3ba392f90df4d26c64

Best regards,
-- 
Oliver Smith <ollieparanoid@postmarketos.org>