Merge branch 'fix-dump-log-errmsg'

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

diff --git a/i3-migrate-config-to-v4 b/i3-migrate-config-to-v4
index 4dd4418f70862cfaf2c74f5a437f2b7c5a53725d..c8ff41c933bf368efad8677c7983aea2d2fafaff 100755 (executable)
--- a/i3-migrate-config-to-v4
+++ b/i3-migrate-config-to-v4
@@ -316,10 +316,10 @@ sub convert_command {
     if ($command =~ /^m[0-9]+/) {
         my ($number) = ($command =~ /^m([0-9]+)/);
         if (exists $workspace_names{$number}) {
-            print qq|$statement $key move workspace $workspace_names{$number}\n|;
+            print qq|$statement $key move container to workspace $workspace_names{$number}\n|;
             return;
         } else {
-            print qq|$statement $key move workspace $number\n|;
+            print qq|$statement $key move container to workspace $number\n|;
             return;
         }
     }
@@ -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";
 }