From 7f7348b47049e8d25fb5b98db1d6215f8f643f0d Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Mon, 29 Jun 2020 07:18:32 +0200
Subject: [PATCH] powerline-go: fix argument to -error option
Addition of the line "local old_exit_status=$?" broke the call to
powerline-go.
PR #1364
---
modules/programs/powerline-go.nix | 2 +-
tests/modules/programs/powerline-go/standard.nix | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/programs/powerline-go.nix b/modules/programs/powerline-go.nix
index 0727a69cc..a4cd233cf 100644
--- a/modules/programs/powerline-go.nix
+++ b/modules/programs/powerline-go.nix
@@ -110,7 +110,7 @@ in {
programs.bash.initExtra = ''
function _update_ps1() {
local old_exit_status=$?
- PS1="$(${pkgs.powerline-go}/bin/powerline-go -error $? ${commandLineArguments})"
+ PS1="$(${pkgs.powerline-go}/bin/powerline-go -error $old_exit_status ${commandLineArguments})"
${cfg.extraUpdatePS1}
return $old_exit_status
}
diff --git a/tests/modules/programs/powerline-go/standard.nix b/tests/modules/programs/powerline-go/standard.nix
index 9788ce7db..b01fcb1a7 100644
--- a/tests/modules/programs/powerline-go/standard.nix
+++ b/tests/modules/programs/powerline-go/standard.nix
@@ -22,7 +22,7 @@ with lib;
assertFileExists home-files/.bashrc
assertFileContains \
home-files/.bashrc \
- '/bin/powerline-go -error $? -modules nix-shell -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2'
+ '/bin/powerline-go -error $old_exit_status -modules nix-shell -newline -path-aliases \~/project/foo=prj-foo -ignore-repos /home/me/project1,/home/me/project2'
'';
};
}