From 6d12f7aecd23c4e95ca1aa86bd8ad986373e1f9b Mon Sep 17 00:00:00 2001
From: Martin Winkler <efelon@winklerfamilie.eu>
Date: Thu, 5 Dec 2019 15:13:40 +0100
Subject: [PATCH] Bump mayan version to 3.3.3

supervisor conf working out of the box
---
 seqs/mayan-edms.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/seqs/mayan-edms.sh b/seqs/mayan-edms.sh
index c3a4f74..7b25f50 100755
--- a/seqs/mayan-edms.sh
+++ b/seqs/mayan-edms.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 toolName="Mayan EDMS"
-toolVersion="3.3.2"
+toolVersion="3.3.3"
 toolRoot="/opt/mayan-edms"
 toolMediaFolder="/opt/mayan-edms/media"
 
@@ -90,6 +90,7 @@ step_10() {
   exe sudo -u mayan ${toolRoot}/bin/pip uninstall -r "$uninstallRemovalsLoc"
   saveReturn $?
   endReturn
+  exe systemctl stop supervisor
   exe sudo -u mayan ${toolRoot}/bin/pip install --no-cache-dir mayan-edms==$toolVersion
   saveReturn $?
   endReturn
@@ -97,18 +98,22 @@ step_10() {
   toolScript preparestatic --noinput
   # Generating new supervisor file
   step_6
-  exe systemctl restart supervisor
+  exe systemctl start supervisor
 }
 uninstallRemovalsLoc="/tmp/removals.txt"
 
 
 step_13_info() { echo "$toolName management script"; }
 step_13() {
-  echo -n "Command (empty for help): "
-  if [ $DRY != 0 ]; then
-    echo " dryrun"
+  if [ -z "$2" ] || [ "$2" == "" ] ; then
+    echo -n "Command (empty for help): "
+    if [ $DRY != 0 ]; then
+      echo " dryrun"
+    else
+      read command 
+    fi
   else
-    read command 
+    command="$2"
   fi
   toolScript "$command"
 }