summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stapelberg <michael@stapelberg.de>2011-10-10 20:29:44 +0100
committerMichael Stapelberg <michael@stapelberg.de>2011-10-10 20:46:55 +0100
commit692f0124a34625f3296d97496b721973e1f951a2 (patch)
tree251b650ceabcff173c64e6ee7c172106f3a0d695
parent9429d93a7e1200b30d3d6bbf133cdfd933a44d74 (diff)
Don’t use a default setting for 'order'
This will make i3status depend on a useful configuration file (so /etc/i3status.conf has to be installed) to actually output anything. However, it fixes a very common error: people edit their i3status.conf and don’t get that the first order directive has to use =, not +=. Since order is now empty by default, you can use += everywhere.
-rw-r--r--i3status.c5
-rw-r--r--i3status.conf2
-rw-r--r--man/i3status.man2
3 files changed, 6 insertions, 3 deletions
diff --git a/i3status.c b/i3status.c
index a02360b..ca07931 100644
--- a/i3status.c
+++ b/i3status.c
@@ -253,7 +253,7 @@ int main(int argc, char *argv[]) {
};
cfg_opt_t opts[] = {
- CFG_STR_LIST("order", "{ipv6,\"run_watch DHCP\",\"wireless wlan0\",\"ethernet eth0\",\"battery 0\",\"cpu_temperature 0\",load,time}", CFGF_NONE),
+ CFG_STR_LIST("order", "{}", CFGF_NONE),
CFG_SEC("general", general_opts, CFGF_NONE),
CFG_SEC("run_watch", run_watch_opts, CFGF_TITLE | CFGF_MULTI),
CFG_SEC("wireless", wireless_opts, CFGF_TITLE | CFGF_MULTI),
@@ -307,6 +307,9 @@ int main(int argc, char *argv[]) {
if (cfg_parse(cfg, configfile) == CFG_PARSE_ERROR)
return EXIT_FAILURE;
+ if (cfg_size(cfg, "order") == 0)
+ die("Your 'order' array is empty. Please fix your config.\n");
+
cfg_general = cfg_getsec(cfg, "general");
if (cfg_general == NULL)
die("Could not get section \"general\"\n");
diff --git a/i3status.conf b/i3status.conf
index 2c90a27..ee0db5c 100644
--- a/i3status.conf
+++ b/i3status.conf
@@ -3,7 +3,7 @@ general {
interval = 5
}
-order = "ipv6"
+order += "ipv6"
order += "disk /"
order += "run_watch DHCP"
order += "run_watch VPN"
diff --git a/man/i3status.man b/man/i3status.man
index f9bcebf..b1564ff 100644
--- a/man/i3status.man
+++ b/man/i3status.man
@@ -51,7 +51,7 @@ general {
interval = 5
}
-order = "ipv6"
+order += "ipv6"
order += "disk /"
order += "run_watch DHCP"
order += "run_watch VPN"