]>
Commit | Line | Data |
---|---|---|
917391cf ER |
1 | diff -Nur gcfilms-pre/bin/gcfilms gcfilms/bin/gcfilms |
2 | --- gcfilms-pre/bin/gcfilms 2005-06-26 17:28:53.000000000 +0200 | |
3 | +++ gcfilms/bin/gcfilms 2005-08-08 11:40:26.000000000 +0200 | |
4b9a3c3f ER |
4 | @@ -26,35 +26,28 @@ |
5 | use utf8; | |
6 | ||
7 | use File::Path; | |
8 | -use FindBin qw($RealBin); | |
9 | use POSIX qw(locale_h); | |
10 | ||
11 | -use lib "$RealBin/../lib/gcfilms"; | |
12 | +use lib qw(/usr/share/gcfilms/lib); | |
13 | ||
14 | #XDG stuff | |
15 | my $home = $ENV{'HOME'}; | |
16 | -$home =~ s/\\/\//g if ($^O =~ /win32/i); | |
17 | ||
18 | -$ENV{XDG_CONFIG_HOME} = $RealBin.'/../config' if ($^O =~ /win32/i); | |
19 | $ENV{XDG_CONFIG_HOME} = $home.'/.config' if ! exists $ENV{XDG_CONFIG_HOME}; | |
20 | mkpath $ENV{XDG_CONFIG_HOME}; | |
21 | ||
22 | -$ENV{XDG_DATA_HOME} = $RealBin.'/../data' if ($^O =~ /win32/i); | |
23 | $ENV{XDG_DATA_HOME} = $home.'/.local/share' if ! exists $ENV{XDG_DATA_HOME}; | |
24 | mkpath $ENV{XDG_DATA_HOME}; | |
25 | ||
26 | $ENV{GCF_CONFIG_HOME} = $ENV{XDG_CONFIG_HOME}.'/gcfilms'; | |
27 | -$ENV{GCF_CONFIG_HOME} = $ENV{XDG_CONFIG_HOME} if ($^O =~ /win32/i); | |
28 | mkdir $ENV{GCF_CONFIG_HOME}; | |
29 | $ENV{GCF_CONFIG_FILE} = $ENV{GCF_CONFIG_HOME}.'/gcfilms.conf'; | |
30 | $ENV{GCF_DATA_HOME} = $ENV{XDG_DATA_HOME}.'/gcfilms'; | |
31 | -$ENV{GCF_DATA_HOME} = $ENV{XDG_DATA_HOME} if ($^O =~ /win32/i); | |
32 | mkdir $ENV{GCF_DATA_HOME}; | |
33 | ||
34 | -$ENV{GCF_BIN_DIR} = $RealBin; | |
35 | -($ENV{GCF_LIB_DIR} = $ENV{GCF_BIN_DIR}) =~ s/bin\/?$/lib\/gcfilms/; | |
36 | - | |
37 | -($ENV{GCF_SHARE_DIR} = $ENV{GCF_BIN_DIR}) =~ s/bin\/?$/share\/gcfilms/; | |
38 | +$ENV{GCF_BIN_DIR} = '/usr/bin'; | |
39 | +$ENV{GCF_LIB_DIR} = '/usr/share/gcfilms/lib'; | |
40 | +$ENV{GCF_SHARE_DIR} = '/usr/share/gcfilms'; | |
41 | ||
42 | my $options = new GCOptionLoader($ENV{GCF_CONFIG_FILE}); | |
43 | ||
917391cf ER |
44 | diff -Nur gcfilms-pre/lib/gcfilms/GCExport/GCExportBase.pm gcfilms/lib/gcfilms/GCExport/GCExportBase.pm |
45 | --- gcfilms-pre/lib/gcfilms/GCExport/GCExportBase.pm 2005-07-22 15:29:09.000000000 +0200 | |
46 | +++ gcfilms/lib/gcfilms/GCExport/GCExportBase.pm 2005-08-08 11:40:26.000000000 +0200 | |
47 | @@ -29,11 +29,6 @@ | |
4b9a3c3f | 48 | use File::Basename; |
917391cf ER |
49 | use File::Copy; |
50 | ||
51 | - if ($^O =~ /win32/i) | |
52 | - { | |
53 | - use File::DosGlob 'glob'; | |
54 | - } | |
4b9a3c3f | 55 | - |
917391cf ER |
56 | #Methods to be overriden in specific classes |
57 | ||
58 | sub new | |
59 | diff -Nur gcfilms-pre/lib/gcfilms/GCExport.pm gcfilms/lib/gcfilms/GCExport.pm | |
60 | --- gcfilms-pre/lib/gcfilms/GCExport.pm 2005-04-07 19:18:45.000000000 +0200 | |
61 | +++ gcfilms/lib/gcfilms/GCExport.pm 2005-08-08 11:40:26.000000000 +0200 | |
62 | @@ -25,17 +25,13 @@ | |
fa44ee9a ER |
63 | use strict; |
64 | ||
65 | use File::Basename; | |
66 | -use FindBin qw($RealBin); | |
67 | ||
68 | use base 'Exporter'; | |
69 | our @EXPORT = qw(@exportersArray); | |
70 | ||
71 | our @exportersArray; | |
72 | ||
73 | -use Cwd; | |
74 | -my $oldCwd = getcwd; | |
75 | -chdir $RealBin; | |
917391cf ER |
76 | -foreach (glob "../lib/gcfilms/GCExport/*.pm") |
77 | +foreach (glob "/usr/share/gcfilms/lib/GCExport/*.pm") | |
fa44ee9a ER |
78 | { |
79 | my $export = basename($_, '.pm')."\n"; | |
917391cf | 80 | next if $export =~ /GCExportBase/; |
fa44ee9a ER |
81 | @@ -46,7 +42,6 @@ |
82 | die "Fatal error with exporter $export\n$@" if $@; | |
83 | push @exportersArray, $obj if ! $obj->{errors}; | |
84 | } | |
85 | -chdir $oldCwd; | |
86 | ||
87 | use Gtk2; | |
88 | use GCDialogs; | |
917391cf ER |
89 | diff -Nur gcfilms-pre/lib/gcfilms/GCImport.pm gcfilms/lib/gcfilms/GCImport.pm |
90 | --- gcfilms-pre/lib/gcfilms/GCImport.pm 2005-04-10 14:24:33.000000000 +0200 | |
91 | +++ gcfilms/lib/gcfilms/GCImport.pm 2005-08-08 11:40:26.000000000 +0200 | |
92 | @@ -23,17 +23,13 @@ | |
fa44ee9a ER |
93 | ################################################### |
94 | ||
95 | use File::Basename; | |
96 | -use FindBin qw($RealBin); | |
97 | ||
98 | use base 'Exporter'; | |
99 | our @EXPORT = qw(@importersArray); | |
100 | ||
101 | our @importersArray; | |
102 | ||
103 | -use Cwd; | |
104 | -my $oldCwd = getcwd; | |
105 | -chdir $RealBin; | |
917391cf ER |
106 | -foreach (glob "../lib/gcfilms/GCImport/*.pm") |
107 | +foreach (glob "/usr/share/gcfilms/lib/GCImport/*.pm") | |
fa44ee9a ER |
108 | { |
109 | my $import = basename($_, '.pm')."\n"; | |
917391cf | 110 | next if $import =~ /GCImportBase/; |
fa44ee9a ER |
111 | @@ -44,7 +40,6 @@ |
112 | die "Fatal error with importer $import\n$@" if $@; | |
113 | push @importersArray, $obj if ! $obj->{errors}; | |
114 | } | |
115 | -chdir $oldCwd; | |
116 | ||
117 | use Gtk2; | |
118 | use GCDialogs; | |
917391cf ER |
119 | diff -Nur gcfilms-pre/lib/gcfilms/GCLang.pm gcfilms/lib/gcfilms/GCLang.pm |
120 | --- gcfilms-pre/lib/gcfilms/GCLang.pm 2005-06-11 14:18:36.000000000 +0200 | |
121 | +++ gcfilms/lib/gcfilms/GCLang.pm 2005-08-08 11:40:26.000000000 +0200 | |
122 | @@ -29,19 +29,10 @@ | |
fa44ee9a ER |
123 | our @EXPORT = qw(%langs @langsNames); |
124 | ||
125 | use File::Basename; | |
126 | - use FindBin qw($RealBin $Script); | |
127 | - | |
128 | - my $baseDir = $RealBin; | |
129 | - $baseDir .= '/bin' if $Script =~ m/install$/; | |
130 | - $baseDir = '..' if $Script eq '-e'; | |
131 | - | |
132 | our %langs; | |
133 | ||
134 | - use Cwd; | |
135 | - my $oldCwd = getcwd; | |
136 | - chdir $baseDir; | |
917391cf ER |
137 | - use lib '../lib/gcfilms/'; |
138 | - foreach (glob "../lib/gcfilms/GCLang/*.pm") | |
fa44ee9a | 139 | + use lib '/usr/share/gcfilms/lib'; |
917391cf | 140 | + foreach (glob "/usr/share/gcfilms/lib/GCLang/*.pm") |
fa44ee9a ER |
141 | { |
142 | my $lang = basename($_, '.pm'); | |
917391cf | 143 | eval "use GCLang::$lang"; |
fa44ee9a ER |
144 | @@ -49,7 +40,6 @@ |
145 | eval "%tmpLang = %GCLang::${lang}::lang"; | |
146 | $langs{$lang} = \%tmpLang; | |
147 | } | |
148 | - chdir $oldCwd; | |
149 | our @langsNames; | |
150 | foreach (keys %langs) | |
151 | { | |
917391cf ER |
152 | diff -Nur gcfilms-pre/lib/gcfilms/GCMainWindow.pm gcfilms/lib/gcfilms/GCMainWindow.pm |
153 | --- gcfilms-pre/lib/gcfilms/GCMainWindow.pm 2005-07-20 19:46:17.000000000 +0200 | |
154 | +++ gcfilms/lib/gcfilms/GCMainWindow.pm 2005-08-08 11:40:26.000000000 +0200 | |
155 | @@ -125,11 +125,6 @@ | |
156 | package GCFrame; | |
157 | use base "Gtk2::Window"; | |
158 | ||
159 | - if ($^O =~ /win32/i) | |
160 | - { | |
161 | - use File::DosGlob 'glob'; | |
162 | - } | |
163 | - | |
164 | use GCMoviesLists; | |
165 | use GCPlugins; | |
166 | use GCGraphicComponents; | |
167 | diff -Nur gcfilms-pre/lib/gcfilms/GCOptions.pm gcfilms/lib/gcfilms/GCOptions.pm | |
168 | --- gcfilms-pre/lib/gcfilms/GCOptions.pm 2005-07-14 16:39:08.000000000 +0200 | |
169 | +++ gcfilms/lib/gcfilms/GCOptions.pm 2005-08-08 11:40:26.000000000 +0200 | |
170 | @@ -65,7 +65,7 @@ | |
171 | open OPTIONS, ">$file" or $self->{parent}->optionsError('create'); | |
172 | printf OPTIONS 'images='.$ENV{GCF_DATA_HOME}.'/images/ | |
173 | autosave=1 | |
174 | -browser=firefox | |
175 | +browser=mozilla-firefox | |
176 | file='.$ENV{GCF_DATA_HOME}.'/films.gcf | |
177 | order==0 | |
178 | split=300 | |
179 | diff -Nur gcfilms-pre/lib/gcfilms/GCPlugins.pm gcfilms/lib/gcfilms/GCPlugins.pm | |
180 | --- gcfilms-pre/lib/gcfilms/GCPlugins.pm 2005-06-30 22:51:37.000000000 +0200 | |
181 | +++ gcfilms/lib/gcfilms/GCPlugins.pm 2005-08-08 11:40:26.000000000 +0200 | |
182 | @@ -26,18 +26,13 @@ | |
fa44ee9a ER |
183 | use strict; |
184 | ||
185 | use File::Basename; | |
186 | - use FindBin qw($RealBin); | |
187 | ||
188 | use base 'Exporter'; | |
189 | our @EXPORT = qw(%pluginsMap @pluginsNameArray); | |
190 | ||
191 | our %pluginsMap; | |
192 | ||
193 | - use Cwd; | |
194 | - my $oldCwd = getcwd; | |
195 | - chdir $RealBin; | |
196 | - | |
917391cf ER |
197 | - foreach (glob "../lib/gcfilms/GCPlugins/*.pm") |
198 | + foreach (glob "/usr/share/gcfilms/lib/GCPlugins/*.pm") | |
fa44ee9a ER |
199 | { |
200 | my $plugin = basename($_, '.pm')."\n"; | |
917391cf ER |
201 | next if $plugin =~ /GCPluginsBase/; |
202 | @@ -49,7 +44,6 @@ | |
fa44ee9a ER |
203 | #push @pluginsArray, $obj; |
204 | $pluginsMap{$obj->getName} = $obj; | |
205 | } | |
206 | - chdir $oldCwd; | |
207 | ||
208 | our @pluginsNameArray = sort keys %pluginsMap; | |
209 | ||
917391cf ER |
210 | diff -Nur gcfilms-pre/lib/gcfilms/GCStyle.pm gcfilms/lib/gcfilms/GCStyle.pm |
211 | --- gcfilms-pre/lib/gcfilms/GCStyle.pm 2005-04-04 23:08:15.000000000 +0200 | |
212 | +++ gcfilms/lib/gcfilms/GCStyle.pm 2005-08-08 11:40:26.000000000 +0200 | |
213 | @@ -28,19 +28,15 @@ | |
214 | use base 'Exporter'; | |
215 | our @EXPORT = qw(%styles); | |
fa44ee9a | 216 | |
917391cf | 217 | - use FindBin qw($RealBin); |
fa44ee9a | 218 | use File::Basename; |
917391cf ER |
219 | our %styles; |
220 | ||
221 | - use Cwd; | |
222 | - my $oldCwd = getcwd; | |
223 | - chdir $RealBin; | |
224 | - foreach (glob "../share/gcfilms/style/*") | |
225 | + foreach (glob "/usr/share/gcfilms/*") | |
226 | { | |
227 | my $style = basename($_); | |
228 | next if $style eq 'CVS'; | |
229 | my %tmpStyle; | |
230 | - $tmpStyle{dir} = $RealBin.'/'.$_; | |
231 | + $tmpStyle{dir} = $_; | |
232 | $tmpStyle{rcFile} = $tmpStyle{dir}.'/gtkrc'; | |
233 | $tmpStyle{name} = $style; | |
234 | $styles{$style} = \%tmpStyle; | |
235 | @@ -49,8 +45,6 @@ | |
236 | # $tmpStyle{dir} = ''; | |
237 | # $tmpStyle{name} = 'Gtk'; | |
238 | # $styles{Gtk} = \%tmpStyle; | |
fa44ee9a | 239 | - |
917391cf ER |
240 | - chdir $oldCwd; |
241 | } | |
242 | ||
243 | 1; |