MyFavMirrors
/
markdown-resume
mirror of https://github.com/there4/markdown-resume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #66 from asbjornu/feature/path-fixes 

Improve path handling when installed via composer.
This commit is contained in:
Craig Davis 2017-11-13 15:46:46 -08:00 committed by GitHub
parent a1174e1732 48a48ff93a
commit 7ecde3ae7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bin/md2resume
View File

@ -3,16 +3,24 @@
error_reporting(E_ALL | E_STRICT); error_reporting(E_ALL | E_STRICT);
$baseDir = dirname(__DIR__); $baseDir = dirname(__DIR__);
$cwd = getcwd();
$templatePath = $baseDir . '/templates'; $templatePath = $baseDir . '/templates';
$consoleTemplatePath = $baseDir . '/src/Resume/Templates'; $consoleTemplatePath = $baseDir . '/src/Resume/Templates';
// When md2resume is installed with composer, it resides in the a
// 'markdown-resume' subdirectory of the 'vendor' directory, so we need to
// walk up a few folders to find 'autoload.php'.
$autoloadPath = basename($baseDir) === 'markdown-resume'
? realpath($baseDir . '/../../autoload.php')
: $baseDir . '/vendor/autoload.php';
// If the dependencies aren't installed, we have to bail and offer some help. // If the dependencies aren't installed, we have to bail and offer some help.
if (!file_exists($baseDir . '/vendor/autoload.php')) { if (!file_exists($autoloadPath)) {
exit("\nPlease run `composer install` to install dependencies.\n\n"); exit("\nThe dependency '$autoloadPath' was not found. Please run `composer install` to install dependencies.\n\n");
} }
// Bootstrap our application with the Composer autoloader // Bootstrap our application with the Composer autoloader
$app = include $baseDir . '/vendor/autoload.php'; $app = include $autoloadPath;
// Setup the namespace for our own namespace // Setup the namespace for our own namespace
$app->add('Resume', $baseDir . '/src'); $app->add('Resume', $baseDir . '/src');
@ -22,8 +30,9 @@ $console = new Resume\Cli\Resume();
// Fetch the version // Fetch the version
chdir($baseDir); chdir($baseDir);
$versionCmd = 'git describe --abbrev=0 --tags'; $versionCmd = 'git describe --abbrev=0 --tags 2>/dev/null';
$version = trim(shell_exec($versionCmd)); $version = trim(shell_exec($versionCmd));
chdir($cwd);
// Fetch the project name and description // Fetch the project name and description
$project = json_decode(file_get_contents(__DIR__ . '/../composer.json')); $project = json_decode(file_get_contents(__DIR__ . '/../composer.json'));