From 1fffdbce79d2df5e256af362f56183594224eb28 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 14 Nov 2018 12:12:03 +0100
Subject: [PATCH] Fix `status current-command`

As it turns out, this just always printed "fish".

The solution here is a bit hacky as we go via the $_ variable.

Fixes #5339.
---
 src/builtin_status.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/builtin_status.cpp b/src/builtin_status.cpp
index b05e1ccfc..4862a8897 100644
--- a/src/builtin_status.cpp
+++ b/src/builtin_status.cpp
@@ -423,8 +423,15 @@ int builtin_status(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         }
         case STATUS_CURRENT_CMD: {
             CHECK_FOR_UNEXPECTED_STATUS_ARGS(opts.status_cmd)
-            streams.out.append(program_name);
-            streams.out.push_back(L'\n');
+            // HACK: Go via the deprecated variable to get the command.
+            const auto var = env_get(L"_");
+            if (!var.missing_or_empty()) {
+                streams.out.append(var->as_string());
+                streams.out.push_back(L'\n');
+            } else {
+                streams.out.append(program_name);
+                streams.out.push_back(L'\n');
+            }
             break;
         }
         case STATUS_FISH_PATH: {