From ea522742c58e4819e4c4b2db29f77e0bf1b5b5eb Mon Sep 17 00:00:00 2001
From: Ludovic Pouzenc <ludovic@pouzenc.fr>
Date: Sat, 12 Mar 2016 00:52:58 +0100
Subject: Bugfix : dont use fixed path for source path

---
 generator/make.sh  | 9 ++++++---
 generator/quick.sh | 5 ++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'generator')

diff --git a/generator/make.sh b/generator/make.sh
index fed4a03..ebd720e 100755
--- a/generator/make.sh
+++ b/generator/make.sh
@@ -17,6 +17,9 @@
 # You should have received a copy of the GNU General Public License
 # along with CHD Gestion.  If not, see <http://www.gnu.org/licenses/>.
 # 
+this=$(readlink -f $0)
+src_dir=$(dirname $this)
+
 cd /var/www
 
 # Sauver la précédente fournée
@@ -33,7 +36,7 @@ cd chd_gestion || exit
 
 ln -s ../composer.phar
 # Personnaliser les dépendances (forcer CakePHP 3.1.10)
-cp -a /root/chd_gestion_generator/composer.json .
+cp -a "$src_dir/composer.json" .
 # Deployer un squellette d'appli (avec les dépendances)
 yes | php composer.phar create-project
 # Cakephp/app nous sert de base, mais a été installé comme dépendance à cause de l'utilisation du composer.json
@@ -66,7 +69,7 @@ Time::setToStringFormat([IntlDateFormatter::SHORT, -1]);
 EOT
 
 # Ajout des personnalisations qui s'expriment pas facilement dans un script
-rsync -ai /root/chd_gestion_generator/before-bake/ ./
+rsync -ai "$src_dir/before-bake/" ./
 
 # Génération de l'ensemble du CRUD ( http://book.cakephp.org/3.0/en/bake/usage.html )
 for table in $(bin/cake bake all | sed -ne 's/^- \(.*\)$/\1/p' | grep -vE '^v_')
@@ -75,4 +78,4 @@ do
 done
 
 # Ecarsement de certains modèles générés
-rsync -aib --backup-dir=../src.orig /root/chd_gestion_generator/after-bake/src/ ./src/
+rsync -aib --backup-dir=../src.orig "$src_dir/after-bake/src/" ./src/
diff --git a/generator/quick.sh b/generator/quick.sh
index e6240c9..1c7e7e8 100755
--- a/generator/quick.sh
+++ b/generator/quick.sh
@@ -17,8 +17,11 @@
 # You should have received a copy of the GNU General Public License
 # along with CHD Gestion.  If not, see <http://www.gnu.org/licenses/>.
 # 
+this=$(readlink -f $0)
+src_dir=$(dirname $this)
+
 cd /var/www/chd_gestion
 
 # Ecarsement de certains modèles générés
-rsync -aib --backup-dir=../src.orig /root/chd_gestion_generator/after-bake/src/ ./src/
+rsync -aib --backup-dir=../src.orig "$src_dir/after-bake/src/" ./src/
 
-- 
cgit v1.1