DB, script and Dockerfile tweaks

Author: rocky

docker/Dockerfile-dev

@@ -19,10 +19,13 @@ COPY requirements-mathicsscript.txt ./
 RUN pip install --no-cache-dir -r requirements-mathicsscript.txt
 
 RUN pip install git+git://github.com/mathics/Mathics.git#egg=Mathics3
-RUN pip install git+git://github.com/Mathics3/mathics-django.git#egg=Mathics-Django
+RUN python -m pip install -e git://github.com/Mathics3/mathics-django#egg=Mathics-Django
 RUN pip install pymathics-natlang
 RUN pip install pymathics-graph
-RUN pip install mathicsscript
+RUN python -m pip install -e git://github.com/Mathics3/mathicsscript#egg=mathicsscript
+RUN cd src/mathicsscript; make
+# RUN pip install mathicsscript
+
 RUN python -m nltk.downloader wordnet omw
 RUN python -m spacy download en
 

docker/django-db/mathics.sqlite

@@ -41,16 +41,6 @@ while (( $# )) ; do
     esac
 done
 
-echo
-echo "~~~~ app/data has been mounted to $MATHICS_HOME/data ~~~~"
-if [[ -n $MATHICS_DJANGO_DB_PATH ]]; then
-    echo "~~~~ SQLite data (worksheets, user info) will be stored in $MATHICS_DJANGO_DB_PATH ~~~~"
-else
-    echo "~~~~ SQLite data (worksheets, user info) will be stored in $MATHICS_HOME/data/mathics.sqlite"
-fi
-echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-echo
-
 case $mathics_mode in
     cli) mathicsscript
 	 $@
@@ -59,6 +49,15 @@ case $mathics_mode in
 	mathics $@
 	;;
     ui|gui)
+	echo
+	echo "~~~~ app/data has been mounted to $MATHICS_HOME/data ~~~~"
+	if [[ -n $MATHICS_DJANGO_DB_PATH ]]; then
+	    echo "~~~~ SQLite data (worksheets, user info) will be stored in $MATHICS_DJANGO_DB_PATH ~~~~"
+	else
+	    echo "~~~~ SQLite data (worksheets, user info) will be stored in $MATHICS_HOME/data/mathics.sqlite"
+	fi
+	echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+	echo
 	mathicsserver -e $@ ;;
     shell)  /bin/bash ;;
     *)   echo "unknown mathics_mode=$mathics_mode. See '$script_cmd --help'" ; exit 2 ;;