From 2effa5b6f8b1fd7b213d146327b927c06594dca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ste=CC=81phane=20Goetz?= <onigoetz@onigoetz.ch>
Date: Thu, 7 Apr 2016 22:07:47 +0200
Subject: [PATCH] Generate can fall back to daux.phar, fixes #354

---
 generate  | 9 ++++++++-
 index.php | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/generate b/generate
index face21b..0ec2d21 100755
--- a/generate
+++ b/generate
@@ -64,7 +64,14 @@ software, even if advised of the possibility of such damage.
 
 */
 
-require_once("vendor/autoload.php");
+if (file_exists('vendor/autoload.php')) {
+    require_once('vendor/autoload.php');
+} elseif (file_exists('daux.phar')) {
+    define('PHAR_DIR', __DIR__);
+    require_once("phar://" . __DIR__ . "/daux.phar/vendor/autoload.php");
+} else {
+    throw new Exception("Impossible to load Daux, missing vendor/ or daux.phar");
+}
 
 $application = new \Todaymade\Daux\Console\Application();
 $application->run();
diff --git a/index.php b/index.php
index 350e1f4..cbdbef6 100644
--- a/index.php
+++ b/index.php
@@ -81,7 +81,7 @@ if (file_exists('vendor/autoload.php')) {
     define('PHAR_DIR', __DIR__);
     require_once("phar://" . __DIR__ . "/daux.phar/vendor/autoload.php");
 } else {
-    throw new Exception("Impossible to load Daux, missing vendor and phar");
+    throw new Exception("Impossible to load Daux, missing vendor/ or daux.phar");
 }
 
 \Todaymade\Daux\Server\Server::serve($_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], $_REQUEST);