From e4792fe9d95b5720d2dec508339c8b202e58c61f Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Wed, 7 Jul 2010 03:04:06 -0500 Subject: [PATCH] move var -> share --- lib/WebGUI/Image/Font.pm | 2 +- lib/WebGUI/Paths.pm | 8 ++++---- lib/WebGUI/Storage.pm | 2 +- {var => share}/default.ttf | Bin {var => share}/site.psgi | 0 .../7.9.8-8.0.0/addMaintenancePageToConfig.pl | 0 .../upgrades/7.9.8-8.0.0/migrateToNewCache.pl | 0 .../upgrades/7.9.8-8.0.0/moveFileLocations.pl | 0 .../upgrades/7.9.8-8.0.0/moveMaintenance.pl | 0 {var => share}/upgrades/_upgrade.skeleton | 0 {var => share}/upgrades/convert-db-to-innodb.sql | 0 11 files changed, 6 insertions(+), 6 deletions(-) rename {var => share}/default.ttf (100%) rename {var => share}/site.psgi (100%) rename {var => share}/upgrades/7.9.8-8.0.0/addMaintenancePageToConfig.pl (100%) rename {var => share}/upgrades/7.9.8-8.0.0/migrateToNewCache.pl (100%) rename {var => share}/upgrades/7.9.8-8.0.0/moveFileLocations.pl (100%) rename {var => share}/upgrades/7.9.8-8.0.0/moveMaintenance.pl (100%) rename {var => share}/upgrades/_upgrade.skeleton (100%) rename {var => share}/upgrades/convert-db-to-innodb.sql (100%) diff --git a/lib/WebGUI/Image/Font.pm b/lib/WebGUI/Image/Font.pm index 6a4085f1e..a14f5ef92 100644 --- a/lib/WebGUI/Image/Font.pm +++ b/lib/WebGUI/Image/Font.pm @@ -73,7 +73,7 @@ sub getFile { if ($self->getStorageId) { return WebGUI::Storage->get($self->session, $self->getStorageId)->getPath($self->getFilename); } else { - return WebGUI::Paths->var . '/default.ttf'; + return WebGUI::Paths->share . '/default.ttf'; } } diff --git a/lib/WebGUI/Paths.pm b/lib/WebGUI/Paths.pm index fb749097b..c6ff91662 100644 --- a/lib/WebGUI/Paths.pm +++ b/lib/WebGUI/Paths.pm @@ -85,7 +85,7 @@ Returns the base directory of the default site uploads content. Returns the file path of the default site create.sql script. -=head2 var +=head2 share Returns the base directory for WebGUI auxiliary files. @@ -102,12 +102,12 @@ BEGIN { spectreConfig => catfile($root, 'etc', 'spectre.conf'), preloadCustom => catfile($root, 'etc', 'preload.custom'), preloadExclusions => catfile($root, 'etc', 'preload.exclude'), - upgrades => catdir($root, 'var', 'upgrades'), + upgrades => catdir($root, 'share', 'upgrades'), extras => catdir($root, 'www', 'extras'), defaultUploads => catdir($root, 'www', 'uploads'), defaultCreateSQL => catdir($root, 'docs', 'create.sql'), - var => catdir($root, 'var'), - defaultPSGI => catdir($root, 'var', 'site.psgi'), + share => catdir($root, 'share'), + defaultPSGI => catdir($root, 'share', 'site.psgi'), ); my $meta = Class::MOP::Class->initialize(__PACKAGE__); for my $sub (keys %paths) { diff --git a/lib/WebGUI/Storage.pm b/lib/WebGUI/Storage.pm index eb11e3a7d..297dc15c4 100644 --- a/lib/WebGUI/Storage.pm +++ b/lib/WebGUI/Storage.pm @@ -259,7 +259,7 @@ sub addFileFromCaptcha { $self->session->errorHandler->warn("Error adding noise: $error"); } # AddNoise generates a different average color depending on library. This is ugly, but the best I can see for now - $error = $image->Annotate(font=>WebGUI::Paths->var.'/default.ttf', pointsize=>40, skewY=>0, skewX=>0, gravity=>'center', fill=>'#ffffff', antialias=>'true', text=>$challenge); + $error = $image->Annotate(font=>WebGUI::Paths->share.'/default.ttf', pointsize=>40, skewY=>0, skewX=>0, gravity=>'center', fill=>'#ffffff', antialias=>'true', text=>$challenge); if($error) { $self->session->errorHandler->warn("Error Annotating image: $error"); } diff --git a/var/default.ttf b/share/default.ttf similarity index 100% rename from var/default.ttf rename to share/default.ttf diff --git a/var/site.psgi b/share/site.psgi similarity index 100% rename from var/site.psgi rename to share/site.psgi diff --git a/var/upgrades/7.9.8-8.0.0/addMaintenancePageToConfig.pl b/share/upgrades/7.9.8-8.0.0/addMaintenancePageToConfig.pl similarity index 100% rename from var/upgrades/7.9.8-8.0.0/addMaintenancePageToConfig.pl rename to share/upgrades/7.9.8-8.0.0/addMaintenancePageToConfig.pl diff --git a/var/upgrades/7.9.8-8.0.0/migrateToNewCache.pl b/share/upgrades/7.9.8-8.0.0/migrateToNewCache.pl similarity index 100% rename from var/upgrades/7.9.8-8.0.0/migrateToNewCache.pl rename to share/upgrades/7.9.8-8.0.0/migrateToNewCache.pl diff --git a/var/upgrades/7.9.8-8.0.0/moveFileLocations.pl b/share/upgrades/7.9.8-8.0.0/moveFileLocations.pl similarity index 100% rename from var/upgrades/7.9.8-8.0.0/moveFileLocations.pl rename to share/upgrades/7.9.8-8.0.0/moveFileLocations.pl diff --git a/var/upgrades/7.9.8-8.0.0/moveMaintenance.pl b/share/upgrades/7.9.8-8.0.0/moveMaintenance.pl similarity index 100% rename from var/upgrades/7.9.8-8.0.0/moveMaintenance.pl rename to share/upgrades/7.9.8-8.0.0/moveMaintenance.pl diff --git a/var/upgrades/_upgrade.skeleton b/share/upgrades/_upgrade.skeleton similarity index 100% rename from var/upgrades/_upgrade.skeleton rename to share/upgrades/_upgrade.skeleton diff --git a/var/upgrades/convert-db-to-innodb.sql b/share/upgrades/convert-db-to-innodb.sql similarity index 100% rename from var/upgrades/convert-db-to-innodb.sql rename to share/upgrades/convert-db-to-innodb.sql