1
0
Fork 0
mirror of https://github.com/yweber/lodel2.git synced 2026-11-15 15:41:39 +01:00

Multiple bugfixes + create_instance.sh script update

- Add an update feature to create_instance.sh script
- Updated webui plugin load instruction (running loader.start() in run)
- Updated the way EmCmponents handles EmGroup
- Updated the way EmFields handles EmClass
- Updated xmlfile translator according to EmComponent modification
This commit is contained in:
Yann 2016-06-30 11:16:12 +02:00
commit 557d277186
9 changed files with 61 additions and 35 deletions

View file

@ -1,10 +1,18 @@
#!/bin/bash
usage() {
echo "Usage : $0 instance_name instance_dir [lodel_libdir]" 1>&2
echo -e "Usage : $0 instance_name (instance_dir|-u) [lodel_libdir]" 1>&2
echo -e "\n\tIf -u given as first argument update instance's loader.py" 1>&2
exit 1
}
cp_loader() {
cp -Rv $libdir/install/loader.py $instdir/
# Adding lib path to loader
sed -i -E "s#^(LODEL2_LIB_ABS_PATH = )None#\1'$libdir'#" "$loader"
}
if [ $# -lt 2 ]
then
echo "Not enough arguments" 1>&2
@ -12,6 +20,7 @@ then
fi
name="$1"
instdir="$2"
@ -21,6 +30,13 @@ libdir="${libdir:=$(realpath $(dirname $0)/..)}/"
loader="$instdir/loader.py"
conf="$instdir/conf.d/lodel2.ini"
if [ $1 = '-u' ]
then
#Update instance
cp_loader
exit 0
fi
if [ -e "$instdir" ]
then
echo "Abording... "$instdir" exists" 1>&2
@ -34,19 +50,15 @@ chmod 700 "$instdir/sessions"
#cp -Rv $libdir/install/* $instdir
cp -Rv $libdir/install/conf.d $instdir/
cp -Rv $libdir/install/loader.py $instdir/
cp -Rv $libdir/examples/em_test.pickle $instdir/editorial_model.pickle
ln -sv $libdir/install/Makefile $instdir/Makefile
ln -sv $libdir/install/lodel_admin.py $instdir/lodel_admin.py
ln -sv $libdir/plugins $instdir/plugins
# Adding lib path to loader
sed -i -E "s#^(LODEL2_LIB_ABS_PATH = )None#\1'$libdir'#" "$loader"
cp_loader
# Adding instance name to conf
sed -i -E "s#^sitename = noname#sitename = $name#" "$conf"
echo -e "\nInstance successfully created in $instdir"
echo -e "============================\n"
echo "Now you should edit files in '${instdir}/conf.d/' and then run : cd $instdir && make dyncode"