Now installing lang/ properly, and config+language files are pulled from the current working directory.

This commit is contained in:
Elijah Perrault committed 2011-03-11 21:39:50 -07:00
1 parent 6033904d0d
commit 580770c5b8
4 files changed
+9 -8

No files matched your search

+2 -2
View File
@@ -24,8 +24,8 @@ BEGIN {
$bin{cwd} = getcwd; $bin{cwd} = getcwd;
if (!-e "$Bin/../build/syswide") { if (!-e "$Bin/../build/syswide") {
# Must be a custom PREFIX install. # Must be a custom PREFIX install.
$bin{etc} = "$bin{cwd}/../etc"; $bin{etc} = "$bin{cwd}/etc";
$bin{var} = "$bin{cwd}/../var"; $bin{var} = "$bin{cwd}/var";
if (!-e "$Bin/lib/Lib/Auto.pm") { if (!-e "$Bin/lib/Lib/Auto.pm") {
# Must be a system wide install. # Must be a system wide install.
$bin{lib} = "$Bin/../lib/autobot/3.0.0"; $bin{lib} = "$Bin/../lib/autobot/3.0.0";
+1
View File
@@ -200,6 +200,7 @@ if ($upref) {
copy("$Bin/bin/genssl", "$PREFIX/bin/$bgenssl"); copy("$Bin/bin/genssl", "$PREFIX/bin/$bgenssl");
chmod 0755, "$PREFIX/bin/auto", "$PREFIX/bin/$bgenssl", "$PREFIX/bin/$bbuildmod"; chmod 0755, "$PREFIX/bin/auto", "$PREFIX/bin/$bgenssl", "$PREFIX/bin/$bbuildmod";
rcopy("$Bin/lib/*", "$libdir/"); rcopy("$Bin/lib/*", "$libdir/");
rcopy("$Bin/lang/*", "$langdir/");
copy("$Bin/etc/example.conf", "$distdir/"); copy("$Bin/etc/example.conf", "$distdir/");
remove_tree("$libdir/File"); remove_tree("$libdir/File");
} }
+3 -3
View File
@@ -13,17 +13,17 @@ sub new
my $self = bless {}, $class; my $self = bless {}, $class;
# Check to see if the configuration file exists. # Check to see if the configuration file exists.
if (!-e "$Auto::Bin/../etc/$file") { if (!-e "$Auto::bin{etc}/$file") {
return 0; return 0;
} }
# Open, read and close the config. # Open, read and close the config.
open(my $FCONF, q{<}, "$Auto::Bin/../etc/$file") or return 0; open(my $FCONF, q{<}, "$Auto::bin{etc}/$file") or return 0;
my @cosfl = <$FCONF> or return 0; my @cosfl = <$FCONF> or return 0;
close $FCONF or return 0; close $FCONF or return 0;
# Save it to self variable. # Save it to self variable.
$self->{'config'}->{'path'} = "$Auto::Bin/../etc/$file"; $self->{'config'}->{'path'} = "$Auto::bin{etc}/$file";
return $self; return $self;
} }
+3 -3
View File
@@ -13,15 +13,15 @@ sub parse
my ($lang) = @_; my ($lang) = @_;
# Check that the language file exists. # Check that the language file exists.
unless (-e "$Auto::Bin/../lang/$lang.alf") { if (!-e "$Auto::bin{lng}/$lang.alf") {
# Otherwise, use English. # Otherwise, use English.
dbug "Language '$lang' not found. Using English."; dbug "Language '$lang' not found. Using English.";
alog "Language '$lang' not found. Using English."; alog "Language '$lang' not found. Using English.";
$lang = "en"; $lang = 'en';
} }
# Open, read and close the file. # Open, read and close the file.
open(my $FALF, q{<}, "$Auto::Bin/../lang/$lang.alf") or return 0; open(my $FALF, '<', "$Auto::bin{lng}/$lang.alf") or return 0;
my @fbuf = <$FALF>; my @fbuf = <$FALF>;
close $FALF; close $FALF;