]>
Commit | Line | Data |
---|---|---|
4b9a3c3f ER |
1 | --- gcfilms/bin/gcfilms 2005-06-26 17:28:53.000000000 +0200 |
2 | +++ bin/gcfilms 2005-08-08 00:33:40.000000000 +0200 | |
3 | @@ -26,35 +26,28 @@ | |
4 | use utf8; | |
5 | ||
6 | use File::Path; | |
7 | -use FindBin qw($RealBin); | |
8 | use POSIX qw(locale_h); | |
9 | ||
10 | -use lib "$RealBin/../lib/gcfilms"; | |
11 | +use lib qw(/usr/share/gcfilms/lib); | |
12 | ||
13 | #XDG stuff | |
14 | my $home = $ENV{'HOME'}; | |
15 | -$home =~ s/\\/\//g if ($^O =~ /win32/i); | |
16 | ||
17 | -$ENV{XDG_CONFIG_HOME} = $RealBin.'/../config' if ($^O =~ /win32/i); | |
18 | $ENV{XDG_CONFIG_HOME} = $home.'/.config' if ! exists $ENV{XDG_CONFIG_HOME}; | |
19 | mkpath $ENV{XDG_CONFIG_HOME}; | |
20 | ||
21 | -$ENV{XDG_DATA_HOME} = $RealBin.'/../data' if ($^O =~ /win32/i); | |
22 | $ENV{XDG_DATA_HOME} = $home.'/.local/share' if ! exists $ENV{XDG_DATA_HOME}; | |
23 | mkpath $ENV{XDG_DATA_HOME}; | |
24 | ||
25 | $ENV{GCF_CONFIG_HOME} = $ENV{XDG_CONFIG_HOME}.'/gcfilms'; | |
26 | -$ENV{GCF_CONFIG_HOME} = $ENV{XDG_CONFIG_HOME} if ($^O =~ /win32/i); | |
27 | mkdir $ENV{GCF_CONFIG_HOME}; | |
28 | $ENV{GCF_CONFIG_FILE} = $ENV{GCF_CONFIG_HOME}.'/gcfilms.conf'; | |
29 | $ENV{GCF_DATA_HOME} = $ENV{XDG_DATA_HOME}.'/gcfilms'; | |
30 | -$ENV{GCF_DATA_HOME} = $ENV{XDG_DATA_HOME} if ($^O =~ /win32/i); | |
31 | mkdir $ENV{GCF_DATA_HOME}; | |
32 | ||
33 | -$ENV{GCF_BIN_DIR} = $RealBin; | |
34 | -($ENV{GCF_LIB_DIR} = $ENV{GCF_BIN_DIR}) =~ s/bin\/?$/lib\/gcfilms/; | |
35 | - | |
36 | -($ENV{GCF_SHARE_DIR} = $ENV{GCF_BIN_DIR}) =~ s/bin\/?$/share\/gcfilms/; | |
37 | +$ENV{GCF_BIN_DIR} = '/usr/bin'; | |
38 | +$ENV{GCF_LIB_DIR} = '/usr/share/gcfilms/lib'; | |
39 | +$ENV{GCF_SHARE_DIR} = '/usr/share/gcfilms'; | |
40 | ||
41 | my $options = new GCOptionLoader($ENV{GCF_CONFIG_FILE}); | |
42 | ||
43 | --- gcfilms/lib/gcfilms/GCStyle.pm 2005-08-08 01:44:54.000000000 +0300 | |
44 | +++ GCStyle.pm 2005-08-08 01:48:39.766115248 +0300 | |
45 | @@ -28,19 +28,15 @@ | |
46 | use base 'Exporter'; | |
47 | our @EXPORT = qw(%styles); | |
48 | ||
49 | - use FindBin qw($RealBin); | |
50 | use File::Basename; | |
51 | our %styles; | |
52 | ||
53 | - use Cwd; | |
54 | - my $oldCwd = getcwd; | |
55 | - chdir $RealBin; | |
56 | foreach (glob "../share/gcfilms/style/*") | |
57 | { | |
58 | my $style = basename($_); | |
59 | next if $style eq 'CVS'; | |
60 | my %tmpStyle; | |
61 | - $tmpStyle{dir} = $RealBin.'/'.$_; | |
62 | + $tmpStyle{dir} = $_; | |
63 | $tmpStyle{rcFile} = $tmpStyle{dir}.'/gtkrc'; | |
64 | $tmpStyle{name} = $style; | |
65 | $styles{$style} = \%tmpStyle; | |
66 | @@ -49,8 +45,6 @@ | |
67 | # $tmpStyle{dir} = ''; | |
68 | # $tmpStyle{name} = 'Gtk'; | |
69 | # $styles{Gtk} = \%tmpStyle; | |
70 | - | |
71 | - chdir $oldCwd; | |
72 | } | |
73 | ||
74 | 1; | |
75 | --- ./lib/gcfilms/GCOptions.pm 2005-07-14 16:39:08.000000000 +0200 | |
76 | +++ ../../lib/gcfilms/GCOptions.pm 2005-08-08 00:56:04.000000000 +0200 | |
77 | @@ -65,7 +65,7 @@ | |
78 | open OPTIONS, ">$file" or $self->{parent}->optionsError('create'); | |
79 | printf OPTIONS 'images='.$ENV{GCF_DATA_HOME}.'/images/ | |
80 | autosave=1 | |
81 | -browser=firefox | |
82 | +browser=mozilla-firefox | |
83 | file='.$ENV{GCF_DATA_HOME}.'/films.gcf | |
84 | order==0 | |
85 | split=300 | |
86 | --- gcfilms/lib/gcfilms/GCStyle.pm 2005-08-08 01:59:05.000000000 +0300 | |
87 | +++ GCStyle.pm 2005-08-08 02:01:04.210942432 +0300 | |
88 | @@ -31,7 +31,7 @@ | |
89 | use File::Basename; | |
90 | our %styles; | |
91 | ||
92 | - foreach (glob "../share/gcfilms/style/*") | |
93 | + foreach (glob "/usr/share/gcfilms/*") | |
94 | { | |
95 | my $style = basename($_); | |
96 | next if $style eq 'CVS'; | |
97 | diff -Nur bla/lib/gcfilms/GCExport.pm ../BUILD/gcfilms/lib/gcfilms/GCExport.pm | |
98 | --- bla/lib/gcfilms/GCExport.pm 2005-04-07 19:18:45.000000000 +0200 | |
99 | +++ ../BUILD/gcfilms/lib/gcfilms/GCExport.pm 2005-08-08 01:04:54.000000000 +0200 | |
100 | @@ -35,7 +35,7 @@ | |
101 | use Cwd; | |
102 | my $oldCwd = getcwd; | |
103 | chdir $RealBin; | |
104 | -foreach (glob "../lib/gcfilms/GCExport/*.pm") | |
105 | +foreach (glob "/usr/share/gcfilms/lib/GCExport/*.pm") | |
106 | { | |
107 | my $export = basename($_, '.pm')."\n"; | |
108 | next if $export =~ /GCExportBase/; | |
109 | diff -Nur bla/lib/gcfilms/GCImport.pm ../BUILD/gcfilms/lib/gcfilms/GCImport.pm | |
110 | --- bla/lib/gcfilms/GCImport.pm 2005-04-10 14:24:33.000000000 +0200 | |
111 | +++ ../BUILD/gcfilms/lib/gcfilms/GCImport.pm 2005-08-08 01:04:54.000000000 +0200 | |
112 | @@ -33,7 +33,7 @@ | |
113 | use Cwd; | |
114 | my $oldCwd = getcwd; | |
115 | chdir $RealBin; | |
116 | -foreach (glob "../lib/gcfilms/GCImport/*.pm") | |
117 | +foreach (glob "/usr/share/gcfilms/lib/GCImport/*.pm") | |
118 | { | |
119 | my $import = basename($_, '.pm')."\n"; | |
120 | next if $import =~ /GCImportBase/; | |
121 | diff -Nur bla/lib/gcfilms/GCLang.pm ../BUILD/gcfilms/lib/gcfilms/GCLang.pm | |
122 | --- bla/lib/gcfilms/GCLang.pm 2005-06-11 14:18:36.000000000 +0200 | |
123 | +++ ../BUILD/gcfilms/lib/gcfilms/GCLang.pm 2005-08-08 01:04:54.000000000 +0200 | |
124 | @@ -40,8 +40,8 @@ | |
125 | use Cwd; | |
126 | my $oldCwd = getcwd; | |
127 | chdir $baseDir; | |
128 | - use lib '../lib/gcfilms/'; | |
129 | - foreach (glob "../lib/gcfilms/GCLang/*.pm") | |
130 | + use lib '/usr/share/gcfilms/lib/'; | |
131 | + foreach (glob "/usr/share/gcfilms/lib/GCLang/*.pm") | |
132 | { | |
133 | my $lang = basename($_, '.pm'); | |
134 | eval "use GCLang::$lang"; | |
135 | diff -Nur bla/lib/gcfilms/GCPlugins.pm ../BUILD/gcfilms/lib/gcfilms/GCPlugins.pm | |
136 | --- bla/lib/gcfilms/GCPlugins.pm 2005-06-30 22:51:37.000000000 +0200 | |
137 | +++ ../BUILD/gcfilms/lib/gcfilms/GCPlugins.pm 2005-08-08 01:04:54.000000000 +0200 | |
138 | @@ -37,7 +37,7 @@ | |
139 | my $oldCwd = getcwd; | |
140 | chdir $RealBin; | |
141 | ||
142 | - foreach (glob "../lib/gcfilms/GCPlugins/*.pm") | |
143 | + foreach (glob "/usr/share/gcfilms/lib/GCPlugins/*.pm") | |
144 | { | |
145 | my $plugin = basename($_, '.pm')."\n"; | |
146 | next if $plugin =~ /GCPluginsBase/; |