install-centos: adding pythonenv wrapper creation; always creating pythonenv...

install-centos: adding pythonenv wrapper creation; always creating pythonenv wrapper script when running in docker

install-centos.sh

@@ -7,11 +7,20 @@
 fod_dir="/srv/flowspy"
 venv_dir="/srv/venv"
 
+inside_docker=0
+
+
 install_basesw=1
 install_fodproper=1
 
+ensure_installed_pythonenv_wrapper=1
+
 #
 
+if [ -e "/.dockenv" ]; then 
+  echo "running inside docker assummed" 1>&2
+  inside_docker=1
+fi
 while [ $# -gt 0 ]; do
 
   if [ $# -ge 1 -a "$1" = "--here" ]; then
@@ -192,6 +201,21 @@ else
 
 	mkdir -p /var/run/fod 
 	#chown fod /var/run/fod
+
+        ##
+
+        if [ "$ensure_installed_pythonenv_wrapper" = 1 -a \( "$inside_docker" = 1 -o ! -e "$fod_dir/pythonenv" \) ]; then
+          echo "adding pythonev wrapper" 1>&2
+          cat > "$fod_dir/pythonenv" <<EOF
+#!/bin/bash
+. "$venv_dir/bin/activate"
+exec "\$@"
+EOF
+          chmod +x "$fod_dir/pythonenv"
+          echo 1>&2
+       fi
+
+       ##
   )
 
   set +e

install-debian.sh

@@ -7,6 +7,8 @@
 fod_dir="/srv/flowspy"
 venv_dir="/srv/venv"
 
+inside_docker=0
+
 install_basesw=1
 install_fodproper=1
 
@@ -95,11 +97,16 @@ function conf_db_access () {
 ##############################################################################
 ##############################################################################
 
+if [ -e "/.dockenv" ]; then 
+  echo "running inside docker assummed" 1>&2
+  inside_docker=1
+fi
+
 if grep -q -E '^systemd$' /proc/1/comm; then 
   echo "system is running systemd as init process, setting default install_systemd_services=1" 1>&2
   install_systemd_services=1
-elif [ -e "/.dockenv" ]; then 
-  echo "running inside docker assummed, setting default install_systemd_services=0" 1>&2
+elif [ "$inside_docker" = 1 ]; then 
+  echo "inside_docker=$inside_docker, so setting default install_systemd_services=0" 1>&2
   install_systemd_services=0
 fi
 
@@ -470,7 +477,7 @@ else
 
 ##
 
-        if [ "$ensure_installed_pythonenv_wrapper" = 1 -a ! -e "$fod_dir/pythonenv" ]; then
+        if [ "$ensure_installed_pythonenv_wrapper" = 1 -a \( "$inside_docker" = 1 -o ! -e "$fod_dir/pythonenv" \) ]; then
           echo "adding pythonev wrapper" 1>&2
           cat > "$fod_dir/pythonenv" <<EOF
 #!/bin/bash