Automatic commit of package [patrix] release [0.1.13-1].

Created by command:

/usr/bin/tito tag

.tito/packages/patrix

@@ -1 +1 @@
-0.1.12-1 ./
+0.1.13-1 ./

patrix.spec

@@ -1,5 +1,5 @@
 Name: patrix
-Version: 0.1.12
+Version: 0.1.13
 Release: 1%{?dist}
 Summary: Command line client for Matrix
 
@@ -52,6 +52,9 @@ room via the command line.
 %{_bindir}/patrix
 
 %changelog
+* Mon Jan 03 2022 Daniel Berteaud <dbd@ehtrace.com> 0.1.13-1
+- Check config readability and global /etc/patrixrc (dbd@ehtrace.com)
+
 * Thu Dec 09 2021 Daniel Berteaud <dani@lapiole.org> 0.1.12-1
 - Revert requiring LWP::Protocol::connect (dani@lapiole.org)
 

scripts/patrix

@@ -52,13 +52,29 @@ GetOptions(
   "perm_reset|reset-permission"        => \$opt->{perm_reset}
 );
 
-if (-e File::HomeDir->my_home . "/.patrixrc" && !$opt->{conf}){
+if (!$opt->{conf}){
+  # Read global config if it exists and is readable
+  if (-f '/etc/patrixrc' && open(CONFIG, '<', '/etc/patrixrc')){
+    $opt->{conf} = '/etc/patrixrc';
+    close CONFIG;
+    debug("Using global config file $opt->{conf}");
+  }
+
+  # If there's a user defined config, use it instead
+  if (-f File::HomeDir->my_home . "/.patrixrc" && open(CONFIG, '<', File::HomeDir->my_home . "/.patrixrc")){
     $opt->{conf} = File::HomeDir->my_home . "/.patrixrc";
+    close CONFIG;
     debug("Using default config file $opt->{conf}");
+  }
 }
+
 if ($opt->{conf} && -e $opt->{conf}){
   read_conf();
 }
+else {
+  die "No configuration found.\nYou should either create one in ~/.patrixrc " .
+      "or give the path of a custom config with --config /path/to/patrixrc";
+}
 
 # alias for --action=foo is --foo
 my @actions = qw(