Merge branch 'master' into next

[i3/i3] / i3-migrate-config-to-v4

diff --git a/i3-migrate-config-to-v4 b/i3-migrate-config-to-v4
index 4dd4418f70862cfaf2c74f5a437f2b7c5a53725d..4f4d0134cd15715d47f2ab8c0ba0bdfc3e09f035 100755 (executable)
--- a/i3-migrate-config-to-v4
+++ b/i3-migrate-config-to-v4
@@ -358,6 +358,8 @@ sub convert_command {
 # add an i3bar invocation automatically if no 'workspace_bar no' was found
 if ($workspace_bar) {
     print "\n";
-    print "# XXX: Automatically added a call to i3bar to provide a workspace bar\n";
-    print "exec i3status | i3bar -d\n";
+    print "# XXX: Automatically added a bar configuration\n";
+    print "bar {\n";
+    print "    status_command i3status\n";
+    print "}\n";
 }