Changeset 8135737 for perl/lib/BarnOwl.pm

Timestamp:

Jan 23, 2012, 5:12:56 PM (12 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.9

Children:

9a2dd0c, ab88b05, 533b3a4

Parents:

678f607

git-author:

Kevin Riggle <kevinr@free-dissociation.com> (12/26/11 17:35:51)

git-committer:

David Benjamin <davidben@mit.edu> (01/23/12 17:12:56)

Message:

rename default config file to .owl/init.pl

motivations: to make clear that the config file is a perl script, which
runs before and is neither shadowed nor superceded by .owl/startup.

fix doc wording per andersk

more doc fixes from andersk

clean up the else-case logic, per andersk

File:

• perl/lib/BarnOwl.pm (modified) (1 diff)

perl/lib/BarnOwl.pm

@@ -329 +329 @@
 our @all_commands;
 
-if(!$configfile && -f $ENV{HOME} . "/.barnowlconf") {
-    $configfile = $ENV{HOME} . "/.barnowlconf";
-}
-$configfile ||= $ENV{HOME}."/.owlconf";
+if(!$configfile) {
+    if (-f get_config_dir() . "/init.pl") {
+        $configfile = get_config_dir() . "/init.pl";
+    } elsif (-f $ENV{HOME} . "/.barnowlconf") {
+        $configfile = $ENV{HOME} . "/.barnowlconf";
+    } else {
+        $configfile = $ENV{HOME}."/.owlconf";
+    }
+}
 
 # populate global variable space for legacy owlconf files