~postmarketos/pmbootstrap-devel

pmbootstrap: helpers/envkernel.fish: export pmbootstrap_dir v1 APPLIED

xtex: 3
 helpers/envkernel.fish: export pmbootstrap_dir
 helpers/envkernel.fish: set prompt prefix in fish-shell
 helpers/envkernel.fish: add deactivate & reactivate function for fish

 3 files changed, 27 insertions(+), 0 deletions(-)
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.sr.ht/~postmarketos/pmbootstrap-devel/patches/48534/mbox | git am -3
Learn more about email & git

[PATCH pmbootstrap 1/3] helpers/envkernel.fish: export pmbootstrap_dir Export this patch

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

[PATCH pmbootstrap 2/3] helpers/envkernel.fish: set prompt prefix in fish-shell Export this patch

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

[PATCH pmbootstrap 3/3] helpers/envkernel.fish: add deactivate & reactivate function for fish Export this patch

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