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
8 -use FindBin qw($RealBin);
9 use POSIX qw(locale_h);
11 -use lib "$RealBin/../lib/gcfilms";
12 +use lib qw(/usr/share/gcfilms/lib);
15 my $home = $ENV{'HOME'};
16 -$home =~ s/\\/\//g if ($^O =~ /win32/i);
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};
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};
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};
34 -$ENV{GCF_BIN_DIR} = $RealBin;
35 -($ENV{GCF_LIB_DIR} = $ENV{GCF_BIN_DIR}) =~ s/bin\/?$/lib\/gcfilms/;
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';
42 my $options = new GCOptionLoader($ENV{GCF_CONFIG_FILE});
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
51 - if ($^O =~ /win32/i)
53 - use File::DosGlob 'glob';
56 #Methods to be overriden in specific classes
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
66 -use FindBin qw($RealBin);
69 our @EXPORT = qw(@exportersArray);
76 -foreach (glob "../lib/gcfilms/GCExport/*.pm")
77 +foreach (glob "/usr/share/gcfilms/lib/GCExport/*.pm")
79 my $export = basename($_, '.pm')."\n";
80 next if $export =~ /GCExportBase/;
82 die "Fatal error with exporter $export\n$@" if $@;
83 push @exportersArray, $obj if ! $obj->{errors};
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
93 ###################################################
96 -use FindBin qw($RealBin);
99 our @EXPORT = qw(@importersArray);
104 -my $oldCwd = getcwd;
106 -foreach (glob "../lib/gcfilms/GCImport/*.pm")
107 +foreach (glob "/usr/share/gcfilms/lib/GCImport/*.pm")
109 my $import = basename($_, '.pm')."\n";
110 next if $import =~ /GCImportBase/;
112 die "Fatal error with importer $import\n$@" if $@;
113 push @importersArray, $obj if ! $obj->{errors};
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
123 our @EXPORT = qw(%langs @langsNames);
126 - use FindBin qw($RealBin $Script);
128 - my $baseDir = $RealBin;
129 - $baseDir .= '/bin' if $Script =~ m/install$/;
130 - $baseDir = '..' if $Script eq '-e';
135 - my $oldCwd = getcwd;
137 - use lib '../lib/gcfilms/';
138 - foreach (glob "../lib/gcfilms/GCLang/*.pm")
139 + use lib '/usr/share/gcfilms/lib';
140 + foreach (glob "/usr/share/gcfilms/lib/GCLang/*.pm")
142 my $lang = basename($_, '.pm');
143 eval "use GCLang::$lang";
145 eval "%tmpLang = %GCLang::${lang}::lang";
146 $langs{$lang} = \%tmpLang;
150 foreach (keys %langs)
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
157 use base "Gtk2::Window";
159 - if ($^O =~ /win32/i)
161 - use File::DosGlob 'glob';
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
171 open OPTIONS, ">$file" or $self->{parent}->optionsError('create');
172 printf OPTIONS 'images='.$ENV{GCF_DATA_HOME}.'/images/
175 +browser=mozilla-firefox
176 file='.$ENV{GCF_DATA_HOME}.'/films.gcf
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
186 - use FindBin qw($RealBin);
189 our @EXPORT = qw(%pluginsMap @pluginsNameArray);
194 - my $oldCwd = getcwd;
197 - foreach (glob "../lib/gcfilms/GCPlugins/*.pm")
198 + foreach (glob "/usr/share/gcfilms/lib/GCPlugins/*.pm")
200 my $plugin = basename($_, '.pm')."\n";
201 next if $plugin =~ /GCPluginsBase/;
203 #push @pluginsArray, $obj;
204 $pluginsMap{$obj->getName} = $obj;
208 our @pluginsNameArray = sort keys %pluginsMap;
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
215 our @EXPORT = qw(%styles);
217 - use FindBin qw($RealBin);
222 - my $oldCwd = getcwd;
224 - foreach (glob "../share/gcfilms/style/*")
225 + foreach (glob "/usr/share/gcfilms/*")
227 my $style = basename($_);
228 next if $style eq 'CVS';
230 - $tmpStyle{dir} = $RealBin.'/'.$_;
231 + $tmpStyle{dir} = $_;
232 $tmpStyle{rcFile} = $tmpStyle{dir}.'/gtkrc';
233 $tmpStyle{name} = $style;
234 $styles{$style} = \%tmpStyle;
236 # $tmpStyle{dir} = '';
237 # $tmpStyle{name} = 'Gtk';
238 # $styles{Gtk} = \%tmpStyle;