yannweb/lodel2_mirror
1
0
Fork 0
mirror of https://github.com/yweber/lodel2.git synced 2026-01-24 15:00:12 +01:00
Code Releases Activity

Bugfix on regression caused by previous bugfix

Browse source 
Previous bugfix on runtest & create instance brokes deployment, now both seems to work fine
This commit is contained in:
Yann 2016-11-09 15:42:04 +01:00
commit df8a088024
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
progs/create_instance.sh
View file

@ -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

2
runtest.sh
View file

@ -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"