MyFavMirrors/markdown-resume
1
0
Fork 0
mirror of https://github.com/there4/markdown-resume.git synced 2024-12-03 08:59:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37 from synchrone/master

Browse Source 
Checking if --template has a directory separator. Closes #7
This commit is contained in:
Craig Davis 2015-03-16 06:51:37 -06:00
commit 20dccd5689
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Resume/Command/HtmlCommand.php
View File

@ -35,7 +35,7 @@ class HtmlCommand extends Command
'template', 'template',
't', 't',
InputOption::VALUE_REQUIRED, InputOption::VALUE_REQUIRED,
'Which of the templates to use' 'Which of the templates to use. Use an absolute path for a custom template.'
) )
->addOption( ->addOption(
'refresh', 'refresh',
@ -102,6 +102,10 @@ class HtmlCommand extends Command
array_push($assets, new FileAsset($fileInfo->getPathname())); array_push($assets, new FileAsset($fileInfo->getPathname()));
} }
usort($assets, function(FileAsset $a, FileAsset $b){
return strcmp($a->getSourcePath(), $b->getSourcePath());
});
$collection = new AssetCollection( $collection = new AssetCollection(
$assets $assets
); );
@ -126,7 +130,13 @@ class HtmlCommand extends Command
if (!$template) { if (!$template) {
$template = $this->app->defaultTemplate; $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')); $templateIndexPath = join(DIRECTORY_SEPARATOR, array($templatePath, 'index.html'));
if (!file_exists($templateIndexPath)) { if (!file_exists($templateIndexPath)) {