From df8a088024e771c1ff7f3bb8b9660a00a019aa85 Mon Sep 17 00:00:00 2001
From: Yann <yann.weber@openedition.org>
Date: Wed, 9 Nov 2016 15:42:04 +0100
Subject: [PATCH] Bugfix on regression caused by previous bugfix

Previous bugfix on runtest & create instance brokes deployment, now both seems to work fine
---
 progs/create_instance.sh | 5 +++--
 runtest.sh               | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/progs/create_instance.sh b/progs/create_instance.sh
index 1e18cda..92e5265 100755
--- a/progs/create_instance.sh
+++ b/progs/create_instance.sh
@@ -10,9 +10,10 @@ loader_update() {
 	libdir=$1
 	install_tpl=$2
 	instdir=$3
+	lib_abs_path=$(dirname $libdir)
 	cp -Rv $install_tpl/loader.py $instdir/loader.py
 	# Adding lib path to loader
-	sed -i -E "s#^(LODEL2_LIB_ABS_PATH = )None#\1'$libdir'#" "$instdir/loader.py"
+	sed -i -E "s#^(LODEL2_LIB_ABS_PATH = )None#\1'$lib_abs_path'#" "$instdir/loader.py"
 }
 
 
@@ -87,7 +88,7 @@ cp -Rv $install_tpl/conf.d $instdir/
 cp -Rv $em_file $instdir/editorial_model.pickle
 ln -sv $install_tpl/Makefile $instdir/Makefile
 ln -sv $install_tpl/lodel_admin.py $instdir/lodel_admin.py
-ln -sv $libdir/lodel/plugins $instdir/plugins
+ln -sv $libdir/plugins $instdir/plugins
 loader_update "$libdir" "$install_tpl" "$instdir"
 
 # Adding instance name to conf
diff --git a/runtest.sh b/runtest.sh
index 594af2c..b0dc8c4 100755
--- a/runtest.sh
+++ b/runtest.sh
@@ -59,7 +59,7 @@ if [ ! -d "$install_model_dir" ]
 then
 	install_model_dir="$(dirname $0)/progs/slim/install_model/"
 fi
-libdir=$(realpath "$(dirname $0)")
+libdir="$(dirname $(realpath $0))/lodel"
 rmdir $testdir
 ./progs/create_instance test_instance $testdir "$install_model_dir" ./examples/em_test.pickle "$libdir"
 echo ./progs/create_instance test_instance $testdir "$install_model_dir" ./examples/em_test.pickle "$libdir"