aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Bürk <admin@airblader.de>2020-03-01 08:28:28 +0100
committerGitHub <noreply@github.com>2020-03-01 08:28:28 +0100
commitcae3b294ad2f94f709cf0f7f57b7be50e9de4b88 (patch)
treedeac5ed6d42c533723d44854e7a06ae3af98052d
parentd2acdcc69f004afd3be7e8981c10be33451f1a80 (diff)
parent9a3318b622ee08a71b1533a66fbe6a564fcb6dc5 (diff)
downloadi3-cae3b294ad2f94f709cf0f7f57b7be50e9de4b88.tar.gz
i3-cae3b294ad2f94f709cf0f7f57b7be50e9de4b88.zip
Merge pull request #3964 from ammgws/_PATH_BSHELL
Use _PATH_BSHELL in nagbar script as well
-rw-r--r--i3-nagbar/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/i3-nagbar/main.c b/i3-nagbar/main.c
index 2f4cb0e3..e59f5a6a 100644
--- a/i3-nagbar/main.c
+++ b/i3-nagbar/main.c
@@ -169,7 +169,7 @@ static void handle_button_release(xcb_connection_t *conn, xcb_button_release_eve
warn("Could not fdopen() temporary script to store the nagbar command");
return;
}
- fprintf(script, "#!/bin/sh\nrm %s\n%s", script_path, button->action);
+ fprintf(script, "#!%s\nrm %s\n%s", _PATH_BSHELL, script_path, button->action);
/* Also closes fd */
fclose(script);
@@ -350,7 +350,7 @@ int main(int argc, char *argv[]) {
cmd = sstrdup(argv[0]);
*(cmd + argv0_len - strlen(".nagbar_cmd")) = '\0';
execl(_PATH_BSHELL, _PATH_BSHELL, cmd, NULL);
- err(EXIT_FAILURE, "execv(/bin/sh, /bin/sh, %s)", cmd);
+ err(EXIT_FAILURE, "execl(%s, %s, %s)", _PATH_BSHELL, _PATH_BSHELL, cmd);
}
argv0 = argv[0];