Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 376908: Installation process should not assume skins are in the same directory as checksetup.pl - Patch by guillomovitch@zarb.org r/a=mkanat

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@226262 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
lpsolit%gmail.com
2007-05-10 17:01:09 +00:00
parent 86427768de
commit ed1eb8cd6e
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/Bugzilla/Constants.pm
View File

@@ -441,7 +441,7 @@ sub bz_locations {
'localconfig' => "$libpath/$localconfig",
'datadir' => "$libpath/$datadir",
'attachdir' => "$libpath/$datadir/attachments",
'skinsdir' => "$libpath/skins/contrib",
'skinsdir' => "$libpath/skins",
# $webdotdir must be in the webtree somewhere. Even if you use a
# local dot, we output images to there. Also, if $webdotdir is
# not relative to the bugzilla root directory, you'll need to

5
mozilla/webtools/bugzilla/Bugzilla/Install/Filesystem.pm
View File

@@ -61,6 +61,7 @@ sub FILESYSTEM {
my $webdotdir = bz_locations()->{'webdotdir'};
my $templatedir = bz_locations()->{'templatedir'};
my $libdir = bz_locations()->{'libpath'};
my $skinsdir = bz_locations()->{'skinsdir'};
my $ws_group = Bugzilla->localconfig->{'webservergroup'};
@@ -201,9 +202,9 @@ sub FILESYSTEM {
# Each standard stylesheet has an associated custom stylesheet that
# we create.
foreach my $standard (<skins/standard/*.css>) {
foreach my $standard (<$skinsdir/standard/*.css>) {
my $custom = $standard;
$custom =~ s|^skins/standard|skins/custom|;
$custom =~ s|\Q$skinsdir\E/standard|$skinsdir/custom|;
$create_files{$custom} = { perms => $ws_readable, contents => <<EOT
/*
* Custom rules for $standard.

2
mozilla/webtools/bugzilla/Bugzilla/User/Setting/Skin.pm
View File

@@ -33,7 +33,7 @@ sub legal_values {
return $self->{'legal_values'} if defined $self->{'legal_values'};
my $dirbase = bz_locations()->{'skinsdir'};
my $dirbase = bz_locations()->{'skinsdir'} . '/contrib';
# Avoid modification of the list BUILTIN_SKIN_NAMES points to by copying the
# list over instead of simply writing $legal_values = BUILTIN_SKIN_NAMES.
my @legal_values = @{(BUILTIN_SKIN_NAMES)};