put configs into correct location

LBCrion · Aug 21, 2021 · 50baf96 · 50baf96
1 parent 99c166a
commit 50baf96
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/meson.build b/meson.build
@@ -23,7 +23,7 @@ dep = [gtk3, glib, ucl, glsh ]
 executable ('sfwbar', sources: src, c_args: ['-DGLIB_DISABLE_DEPRECATION_WARNINGS','-DGDK_DISABLE_DEPRECATED','-DGTK_DISABLE_DEPRECATED'], dependencies: dep, install: true)
 
 install_man('doc/sfwbar.1')
-install_subdir(['config'], install_dir: get_option('datadir') / 'sfwbar' )
+install_subdir('config', install_dir: get_option('datadir') / 'sfwbar', strip_directory : true )
 install_subdir('icons/weather', install_dir: get_option('datadir') / 'sfwbar/icons' )
 install_subdir('icons/misc', install_dir: get_option('datadir') / 'sfwbar/icons' )
 

diff --git a/src/sfwbar.c b/src/sfwbar.c
@@ -133,13 +133,19 @@ GtkWidget *load_config ( struct context *context )
     fname = g_strdup(confname);
   else
     fname = get_xdg_config_file("sfwbar.config");
+  if(fname==NULL)
+  {
+    fprintf(stderr,"Error: can't open config file\n");
+    exit(1);
+  }
+
   uparse = ucl_parser_new(0);
   ucl_parser_add_file(uparse,fname);
   obj = ucl_parser_get_object(uparse);
   g_free(fname);
   json = ucl_parser_get_error(uparse);
   if(json!=NULL)
-    printf("%s\n",json);
+    fprintf(stderr,"%s\n",json);
 
   css_init(obj);