Merge pull request #37 from synchrone/master
Checking if --template has a directory separator. Closes #7
This commit is contained in:
commit
20dccd5689
|
@ -35,7 +35,7 @@ class HtmlCommand extends Command
|
|||
'template',
|
||||
't',
|
||||
InputOption::VALUE_REQUIRED,
|
||||
'Which of the templates to use'
|
||||
'Which of the templates to use. Use an absolute path for a custom template.'
|
||||
)
|
||||
->addOption(
|
||||
'refresh',
|
||||
|
@ -102,6 +102,10 @@ class HtmlCommand extends Command
|
|||
array_push($assets, new FileAsset($fileInfo->getPathname()));
|
||||
}
|
||||
|
||||
usort($assets, function(FileAsset $a, FileAsset $b){
|
||||
return strcmp($a->getSourcePath(), $b->getSourcePath());
|
||||
});
|
||||
|
||||
$collection = new AssetCollection(
|
||||
$assets
|
||||
);
|
||||
|
@ -126,7 +130,13 @@ class HtmlCommand extends Command
|
|||
if (!$template) {
|
||||
$template = $this->app->defaultTemplate;
|
||||
}
|
||||
$templatePath = join(DIRECTORY_SEPARATOR, array($this->app->templatePath, basename($template)));
|
||||
|
||||
if (strpos($template, DIRECTORY_SEPARATOR) !== false) {
|
||||
$templatePath = realpath($template);
|
||||
} else {
|
||||
$templatePath = join(DIRECTORY_SEPARATOR, array($this->app->templatePath, basename($template)));
|
||||
}
|
||||
|
||||
$templateIndexPath = join(DIRECTORY_SEPARATOR, array($templatePath, 'index.html'));
|
||||
|
||||
if (!file_exists($templateIndexPath)) {
|
||||
|
|
Loading…
Reference in New Issue