1 diff -ur trunk/lib/Onis/Data/Persistent/Dbm.pm systemwide-patch/lib/Onis/Data/Persistent/Dbm.pm
2 --- trunk/lib/Onis/Data/Persistent/Dbm.pm 2005-04-17 17:07:05.000000000 +0200
3 +++ systemwide-patch/lib/Onis/Data/Persistent/Dbm.pm 2005-04-17 17:08:27.000000000 +0200
8 -our $DBMDirectory = get_config ('storage_dir') || 'var';
9 +our $DBMDirectory = get_config ('storage_dir') || '/var/lib/onis/';
10 $DBMDirectory =~ s#/$##g;
12 if (!$DBMDirectory or !-d $DBMDirectory)
13 diff -ur trunk/lib/Onis/Data/Persistent/Storable.pm systemwide-patch/lib/Onis/Data/Persistent/Storable.pm
14 --- trunk/lib/Onis/Data/Persistent/Storable.pm 2005-04-17 17:07:05.000000000 +0200
15 +++ systemwide-patch/lib/Onis/Data/Persistent/Storable.pm 2005-04-17 17:08:16.000000000 +0200
19 our $StorageFile = get_config ('storage_file') || 'storage.dat';
20 -our $StorageDir = get_config ('storage_dir') || 'var';
21 +our $StorageDir = get_config ('storage_dir') || '/var/lib/onis/';
23 $StorageDir =~ s#/+$##;
25 diff -ur trunk/onis systemwide-patch/onis
26 --- trunk/onis 2005-04-17 17:07:05.000000000 +0200
27 +++ systemwide-patch/onis 2005-04-17 17:07:29.000000000 +0200
32 - if ($0 =~ m#^(.*)[/\\]#) { chdir ($1); }
34 - unshift (@INC, 'lib');
36 # 0x0010 Language (make not-translated lines red/yellow)
37 # 0x0020 Parser (dropped lines)
38 # 0x0040 Parser (time information)
40 print STDERR $/, __FILE__, ': $Id: onis 88 2005-04-17 14:52:48Z octo $' if ($::DEBUG);
43 -read_config (get_config ('config') ? get_config ('config') : 'onis.conf');
44 +read_config (get_config ('config') ? get_config ('config') : '/etc/onis/onis.conf');
45 read_config (scalar get_config ('theme')) if (get_config ('theme'));
47 my $output = get_config ('output');
50 - $output = "reports/onis.html";
51 + $output = "onis.html";
54 foreach ('Core', get_config ('plugin'))
55 diff -ur trunk/onis.conf systemwide-patch/onis.conf
56 --- trunk/onis.conf 2005-04-17 17:07:05.000000000 +0200
57 +++ systemwide-patch/onis.conf 2005-04-17 17:07:29.000000000 +0200
60 # Sets the directory in which the storage file(s) should be kept. This is used
61 # by ``Dbm'' and ``Storable''.
63 +storage_dir: "/var/lib/onis/";
68 # Style settings. If no theme is given this might result in a lot of very
69 # weird errors, so better set one ;)
70 # Valid themes as of onis 0.7.0: light, liner, dark
71 -theme: "themes/light.theme";
72 +theme: "/usr/share/onis/themes/light.theme";
74 # Read translations from this file.
76 # english.lang german.lang norwegian.lang spanish.lang swedish.lang
77 -language_file: "lang/english.lang";
78 +language_file: "/usr/share/onis/lang/english.lang";
79 Only in systemwide-patch: onis.orig