From d0974d5c5009f41519923ffdbde7e1a0a3155475 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 16 Oct 2018 23:42:53 +1000 Subject: [PATCH 1/3] Fix crash when using workspace back_and_forth with no previous --- sway/commands/workspace.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c index 61aa443d..58c2201d 100644 --- a/sway/commands/workspace.c +++ b/sway/commands/workspace.c @@ -142,7 +142,11 @@ struct cmd_results *cmd_workspace(int argc, char **argv) { strcasecmp(argv[0], "current") == 0) { ws = workspace_by_name(argv[0]); } else if (strcasecmp(argv[0], "back_and_forth") == 0) { - if (!(ws = workspace_by_name(argv[0])) && prev_workspace_name) { + if (!prev_workspace_name) { + return cmd_results_new(CMD_INVALID, "workspace", + "There is no previous workspace"); + } + if (!(ws = workspace_by_name(argv[0]))) { ws = workspace_create(NULL, prev_workspace_name); } } else { From 615d4bf958c4d5075b041dc8b3b9ae449f55828f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Scatena?= Date: Tue, 16 Oct 2018 19:35:06 +0200 Subject: [PATCH 2/3] Revert "Fix SYSCONFDIR to include "prefix"" This reverts commit 6942f5b6845b2cc572ec378365771a34caf50ba1. SYSCONFDIR should be "/etc" even when prefix="/usr" to be FHS compliant. This is the default in meson from v0.44. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 31c3e53e..4fab12d9 100644 --- a/meson.build +++ b/meson.build @@ -114,7 +114,7 @@ if scdoc.found() endforeach endif -add_project_arguments('-DSYSCONFDIR="/@0@/@1@"'.format(prefix, sysconfdir), language : 'c') +add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c') version = get_option('sway-version') if version != '' From 027928bdebad4b2d79b7e89270c0a0c7e6bfe999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Scatena?= Date: Tue, 16 Oct 2018 19:44:45 +0200 Subject: [PATCH 3/3] Set SYSCONFDIR to /etc even when "prefix" is set SYSCONFDIR should be "/etc" even when prefix="/usr" to be FHS compliant. This is the default in meson from v0.44. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 4fab12d9..3fb1e81e 100644 --- a/meson.build +++ b/meson.build @@ -157,7 +157,7 @@ subdir('swaynag') subdir('swaylock') config = configuration_data() -config.set('sysconfdir', join_paths(prefix, sysconfdir)) +config.set('sysconfdir', sysconfdir) config.set('datadir', join_paths(prefix, datadir)) config.set('prefix', prefix)