move var -> share

plainblack · Jul 7, 2010 · e4792fe · e4792fe
1 parent 8943853
commit e4792fe
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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 → share/default.ttf b/var/default.ttf → share/default.ttf
diff --git a/var/site.psgi → share/site.psgi b/var/site.psgi → share/site.psgi
diff --git a/...7.9.8-8.0.0/addMaintenancePageToConfig.pl → ...7.9.8-8.0.0/addMaintenancePageToConfig.pl b/...7.9.8-8.0.0/addMaintenancePageToConfig.pl → ...7.9.8-8.0.0/addMaintenancePageToConfig.pl
diff --git a/...upgrades/7.9.8-8.0.0/migrateToNewCache.pl → ...upgrades/7.9.8-8.0.0/migrateToNewCache.pl b/...upgrades/7.9.8-8.0.0/migrateToNewCache.pl → ...upgrades/7.9.8-8.0.0/migrateToNewCache.pl
diff --git a/...upgrades/7.9.8-8.0.0/moveFileLocations.pl → ...upgrades/7.9.8-8.0.0/moveFileLocations.pl b/...upgrades/7.9.8-8.0.0/moveFileLocations.pl → ...upgrades/7.9.8-8.0.0/moveFileLocations.pl
diff --git a/var/upgrades/7.9.8-8.0.0/moveMaintenance.pl → ...e/upgrades/7.9.8-8.0.0/moveMaintenance.pl b/var/upgrades/7.9.8-8.0.0/moveMaintenance.pl → ...e/upgrades/7.9.8-8.0.0/moveMaintenance.pl
diff --git a/var/upgrades/_upgrade.skeleton → share/upgrades/_upgrade.skeleton b/var/upgrades/_upgrade.skeleton → share/upgrades/_upgrade.skeleton
diff --git a/var/upgrades/convert-db-to-innodb.sql → share/upgrades/convert-db-to-innodb.sql b/var/upgrades/convert-db-to-innodb.sql → share/upgrades/convert-db-to-innodb.sql