ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleaned up paths.

Browse Source
This commit is contained in:
Taylor Otwell
2012-01-28 14:55:08 -06:00
parent 409e908964
commit 97fcea1e51
29 changed files with 86 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
laravel/cli/tasks/bundle/bundler.php
View File

@@ -1,4 +1,4 @@
<?php namespace Laravel\CLI\Tasks\Bundle; isset($GLOBALS['APP_PATH']) or die('No direct script access.');
<?php namespace Laravel\CLI\Tasks\Bundle; defined('DS') or die('No direct script access.');
use Laravel\IoC;
use Laravel\Bundle;
@@ -16,7 +16,7 @@ class Bundler extends Task {
{
foreach ($this->get($bundles) as $bundle)
{
if (is_dir($GLOBALS['BUNDLE_PATH'].$bundle['name']))
if (is_dir(path('bundle').$bundle['name']))
{
echo "Bundle {$bundle['name']} is already installed.";

2
laravel/cli/tasks/bundle/providers/github.php
View File

@@ -17,7 +17,7 @@ class Github implements Provider {
// a location outside of the Git repository, so we don't need
// the full bundle path. We'll just take the basename in case
// the bundle directory has been renamed.
$path = basename($GLOBALS['BUNDLE_PATH']).'/';
$path = basename(path('bundle')).'/';
passthru('git submodule add '.$repository.' '.$path.$bundle['name']);

4
laravel/cli/tasks/bundle/publisher.php
View File

@@ -16,7 +16,7 @@ class Publisher {
{
$path = Bundle::path($bundle);
$this->move($path.'public', $GLOBALS['PUBLIC_PATH'].'bundles'.DS.$bundle);
$this->move($path.'public', path('public').'bundles'.DS.$bundle);
echo "Assets published for bundle [$bundle].".PHP_EOL;
}
@@ -41,7 +41,7 @@ class Publisher {
*/
protected function to($bundle)
{
return $GLOBALS['PUBLIC_PATH'].'bundles'.DS.$bundle.DS;
return path('public').'bundles'.DS.$bundle.DS;
}
/**