refactoring changes from sequpgrade (endReturn, ...) and some modernizations

seqs/paperless.sh

@@ -75,11 +75,11 @@ step_3() {
     status)
       serviceCommand="is-active"
       info -n  " paperless-webserver: "
-      exe systemctl "${serviceCommand:?}" paperless-webserver 
+      exe systemctl "${serviceCommand:?}" paperless-webserver
       info -na " paperless-scheduler: "
-      exe systemctl "${serviceCommand:?}" paperless-scheduler 
+      exe systemctl "${serviceCommand:?}" paperless-scheduler
       info -na "  paperless-consumer: "
-      exe systemctl "${serviceCommand:?}" paperless-consumer 
+      exe systemctl "${serviceCommand:?}" paperless-consumer
       info -na "paperless-task-queue: "
       exe systemctl "${serviceCommand:?}" paperless-task-queue.service
       return 0 ;;
@@ -89,9 +89,9 @@ step_3() {
       error "Unknown command ${1:-"-"}"
       return 1 ;;
   esac
-  exe systemctl "${serviceCommand:?}" paperless-webserver 
-  exe systemctl "${serviceCommand:?}" paperless-scheduler 
-  exe systemctl "${serviceCommand:?}" paperless-consumer 
+  exe systemctl "${serviceCommand:?}" paperless-webserver
+  exe systemctl "${serviceCommand:?}" paperless-scheduler
+  exe systemctl "${serviceCommand:?}" paperless-consumer
   exe systemctl "${serviceCommand:?}" paperless-task-queue
 }
 
@@ -99,8 +99,8 @@ step_10_info() { echo "Install python3"; }
 step_10_alias() { echo "install"; }
 step_10() {
   exe apt update
-  exe apt install ${toolDeps} ${aptOpt:-} 
-  exe apt install ${toolDepsOcr} ${aptOpt:-} 
+  exe apt install ${toolDeps} ${aptOpt:-}
+  exe apt install ${toolDepsOcr} ${aptOpt:-}
 }
 
 step_11_info() { echo "Add system user"; }
@@ -108,9 +108,9 @@ step_11() {
   if id "${toolUser}" >/dev/null 2>&1 ; then
     endReturn -o 1 "User ${toolUser} already exists"
   fi
-  exe adduser "${toolUser}" --system --group --home "${sc_paperlessHome}" 
+  exe adduser "${toolUser}" --system --group --home "${sc_paperlessHome}"
 }
- 
+
 step_12_info() { echo "Install/upgrade ${toolName}"; }
 step_12_alias() { echo "upgrade"; }
 step_12() {
@@ -126,7 +126,7 @@ step_12() {
     fi
   fi
   exe wget ${downUrl} -q -O "${sq_paperlessDownLoc}"
-  endReturn -o $? "Download failed"
+  endReturn "Download failed"
 
   if [ -e "${sc_paperlessDir}" ] ; then
     if step backup --nostart; then
@@ -137,7 +137,7 @@ step_12() {
     toolUpgrade=1
     exe mv "${sc_paperlessDir}" "${sc_paperlessDir}_bu"
   fi
- 
+
   exe tar -xf "${sq_paperlessDownLoc}" -C "${sc_paperlessHome}"
   exe chown -R "${toolUser}": "${sc_paperlessDir}"
 
@@ -152,7 +152,7 @@ step_12() {
     info "Starting post upgrade procedure"
     step postupgrade
     step service start
-    die "Upgrade finished" 
+    die "Upgrade finished"
   fi
 }
 
@@ -180,7 +180,7 @@ step_16() {
   exe sudo -Hu paperless python3 manage.py migrate
 }
 
-step_18_info() { 
+step_18_info() {
   echo "Retag existing documents"
   echoinfo "OPTIONS"
   echoinfo "  -c, --correspondent"
@@ -198,7 +198,7 @@ step_18() {
   exe sudo -Hu paperless python3 manage.py document_retagger "$@"
 }
 
-step_20_info() { 
+step_20_info() {
   echo "Manage document search index"
   echoinfo "  reindex - (default) create index from scratch"
   echoinfo " optimize - updates index to increase search speed and"
@@ -271,7 +271,7 @@ step_100() {
     redis://:password@localhost:6379
   * consume,data,media direcotries (${sc_paperlessHome}/...)
     ../../{consume,data,media}
-  * recommended settings  
+  * recommended settings
     PAPERLESS_FILENAME_FORMAT={created_year}/{title}
     PAPERLESS_SECRET_KEY=change-me
     PAPERLESS_OCR_LANGUAGE=deu+eng
@@ -283,13 +283,13 @@ $(cd "${sc_paperlessDir}"/scripts && for f in *.service; do echo "    $f"; done)
     * WorkingDirectory=/opt/paperless/paperless-ngx/src
     * path to celery: ${sc_paperlessHome}/.local/bin/celery
 * service files webserver
-  * Environment="PAPERLESS_PORT=8084"  
+  * Environment="PAPERLESS_PORT=8084"
     To chose a custom listen port for gunicorn
 * gunicorn.conf.py
-  * bind = f'0.0.0.0:{os.getenv("PAPERLESS_PORT", 8000)}'  
+  * bind = f'0.0.0.0:{os.getenv("PAPERLESS_PORT", 8000)}'
     If IPv6 is disabled/not avilable the first start takes very long
 * /etc/ImageMagick-x/policy.xml
-  * enable access to pdfs  
+  * enable access to pdfs
     <policy domain="coder" rights="read|write" pattern="PDF" />
 
 # Nginx proxy