Better persistance via setting Env variables

Better help for dmathicsscript and dmathicssserver

Fix bug in term-background

Revise symja example in mathics.sqlite

Author: rocky

docker/django-db/mathics.sqlite

@@ -4,26 +4,75 @@ if [ -n "$DEBUG" ]; then
     set -x
 fi
 
+# The release name we are configured to run under.
+typeset dmathicsserver_version='1.0.0'
+
 # Allow customization using POSIX environment variables:
 APP_DATADIR=${APP_DATADIR:-/tmp}
 DOCKER=${DOCKER:-docker}
 TAG=${TAG:-latest}
 
+XAUTH=${XAUTH:-$HOME/.Xauthority}
+touch $XAUTH
+
+DEVICE=''
+if [[ -r /dev/dri ]]; then
+    DEVICE='--device=/dev/dri:/dev/dri'
+fi
+
+CONFIGDIR=${CONFIGDIR:-$HOME/.config/mathicsscript/}
+
+
 # TODO: allow setting:
-#	XDG_CONFIG_HOME \
-#	CONFIG_HOME \
-#	CONFIGDIR \
 #	MATHICSSCRIPT_HISTSIZE \
-#	MATHICSSCRIPT_HISTFILE \
 
 MATHICS_IMAGE=${MATHICS_IMAGE:-mathicsorg/mathics:${TAG}}
 
-for arg in $@ ; do
+typeset -a stripped_args
+stripped_args=()
+
+for arg in "$@" ; do
     case "$arg" in
+        -h | --help | help )
+			cat <<_EOH
+Usage: mathicsscript [OPTIONS] [FILE]
+
+  A command-line interface to Mathics run in a docker container
+
+Options specfic to dmathicsserver:
+
+  -u | -U | --upgrade | upgrade
+  Pull updates to the docker container if there is a new image.
+
+  -h| --help | help
+  Show this help.
+
+  --dversion
+  Show the dmathicsscript version and exit.
+
+Useful Environment Variables:
+
+APP_DATADIR: where application data should be saved. The default is: ${APP_DATADIR}
+DOCKER: the name of the docker program to run. The default is: ${DOCKER}
+CONFIGDIR: directory where Mathics command history is saved. The default is: ${CONFIGDIR}
+MATHICS_IMAGE: Mathics image to use. The default is: ${MATHICS_IMAGE}
+TAG: tag used in MATHICS_IMAGE above. The default is: ${TAG}
+XAUTH: .Xauthority file. The default is: ${XAUTH}
+
+We will now pass help along to the docker image. Just a sec...
+
+_EOH
+			stripped_args+=("--help")
+			;;
         -u | -U | --upgrade | upgrade)
 			$DOCKER pull $MATHICS_IMAGE
-			exit $?
-		;;
+			;;
+        --dversion)
+			echo "dmathicsserver version ${dmathicsserver_version}"
+			exit 100
+			;;
+		default)
+			stripped_args+=($arg)
     esac
 done
 
@@ -41,13 +90,10 @@ else
     style="--style colorful"
 fi
 
-XAUTH=${XAUTH:-$HOME/.Xauthority}
-touch $XAUTH
-
-DEVICE=''
-if [[ -r /dev/dri ]]; then
-    DEVICE='--device=/dev/dri:/dev/dri'
-fi
+# Show environment variables
+for env_setting in CONFIGDIR APP_DATADIR MATHICS_IMAGE DISPLAY; do
+	echo $env_setting = ${!env_setting}
+done
 
 $DOCKER run \
 	--rm \
@@ -58,6 +104,7 @@ $DOCKER run \
 	--network=host \
 	--volume="$PWD":/app \
 	--volume "${APP_DATADIR}:/usr/src/app/data" \
+	--volume "${CONFIGDIR}:/usr/src/app/.config/mathicsscript" \
 	$DEVICE \
     $MATHICS_IMAGE \
-	--mode cli -- $style $@
+	--mode cli -- $style $stripped_args

script/dmathicsscript

@@ -4,6 +4,9 @@ if [ -n "$DEBUG" ]; then
     set -x
 fi
 
+# The release name we are configured to run under.
+typeset dmathicsserver_version='1.0.0'
+
 # Allow customization using POSIX environment variables:
 APP_DATADIR=${APP_DATADIR:-/tmp}
 DOCKER=${DOCKER:-docker}
@@ -13,15 +16,51 @@ TAG=${TAG:-latest}
 
 MATHICS_IMAGE=${MATHICS_IMAGE:-mathicsorg/mathics:${TAG}}
 
+typeset -a stripped_args
+stripped_args=()
+
 for arg in "$@" ; do
     case "$arg" in
+        -h | --help | help )
+			cat <<_EOH
+usage:
+   dmathicsserver [options]
+
+runs the Mathics command-line interface from a docker container.
+
+Options specfic to dmathicsserver:
+
+  -u | -U | --upgrade | upgrade
+  pull updates to the docker container if there is a new image
+
+  -h| --help | help
+  show this help
+
+  -V| --version
+  show the dmathicsscript version and exit
+
+We will now pass help along to the docker image. Just a sec...
+
+_EOH
+			stripped_args+=("--help")
+			;;
         -u | -U | --upgrade | upgrade)
 			$DOCKER pull $MATHICS_IMAGE
-			exit $?
-		;;
+			;;
+        -v | -V | --version)
+			echo "dmathicsserver version ${dmathicsserver_version}"
+			exit 100
+			;;
+		default)
+			stripped_args+=($arg)
     esac
 done
 
+# Show environment variables
+for env_setting in MATHICS_DJANGO_DB_PATH APP_DATADIR MATHICS_IMAGE DISPLAY; do
+	echo $env_setting = ${!env_setting}
+done
+
 $DOCKER run \
 		-it \
 		--name mathics-django \
@@ -34,4 +73,4 @@ $DOCKER run \
 		--volume="${APP_DATADIR}:/usr/src/app/data" \
 		-p 8000:8000 \
 		$MATHICS_IMAGE \
-		--mode ui -- $@
+		--mode ui -- $stripped_args

script/dmathicsserver

@@ -262,11 +262,15 @@ if is_sourced; then
     if ((is_dark_bg == 1)); then
       export DARK_BG=1 # deprecated
       export LC_DARK_BG=1
-      [[ -z $COLORFGBG ]] && export COLORFGBG='0;15'
+      if [[ -z "$COLORFGBG" ]]; then
+		  export COLORFGBG='0;15'
+	  fi
     else
       export DARK_BG=0
       export LC_DARK_BG=0
-      [[ -z $COLORFGBG ]] && export COLORFGBG='15;0'
+      if [[ -z "$COLORFGBG" ]] ; then
+		  export COLORFGBG='15;0'
+	  fi
     fi
   fi
 else