From b79ab33de2878671c61547d1330a22ff282fdf30 Mon Sep 17 00:00:00 2001
From: Lucas Bickel <hairmare@rabe.ch>
Date: Thu, 2 Mar 2017 13:13:34 +0100
Subject: [PATCH] Install to /usr/share/airtime/php per default

The added php subdir lets us keep the vendor and airtime_mvc in the same relative position to each other while keeping everything in /usr/share/$name.

This does not yet take care of cleaning any files left at the old locations, taking care of those would make this installer even more bloated and should be the responsability of apt packages.
---
 install | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/install b/install
index afb1f1b00..85596ce6d 100755
--- a/install
+++ b/install
@@ -377,14 +377,16 @@ if [ "$in_place" = "t" ]; then
     web_root=${AIRTIMEROOT}/airtime_mvc/public
 elif [ -n "$web_root" ]; then
     verbose "\n * Creating Apache web root directory..."
-    cp -R ${AIRTIMEROOT}/airtime_mvc/* ${web_root}
-    web_root=${web_root}/public/
+    cp -R ${AIRTIMEROOT}/airtime_mvc ${web_root}
+    cp -R ${AIRTIMEROOT}/vendor ${web_root}
+    web_root=${web_root}/airtime_mvc/public/
 else
-    verbose "\n * Creating default Apache web root directory /usr/share/airtime/..."
-    web_root="/usr/share/airtime"
+    verbose "\n * Creating default Apache web root directory /usr/share/airtime/php..."
+    web_root="/usr/share/airtime/php"
     mkdir -p ${web_root}
-    cp -R ${AIRTIMEROOT}/airtime_mvc/* ${web_root}
-    web_root=${web_root}/public/
+    cp -R ${AIRTIMEROOT}/airtime_mvc ${web_root}
+    cp -R ${AIRTIMEROOT}/vendor ${web_root}
+    web_root=${web_root}/airtime_mvc/public/
 fi
 verbose "...Done"