backup/backup.sh

@@ -149,7 +149,7 @@ scriptHelp() {
     printf "%sUsage: %s [parameters]%s\n\n" "$bold" "$scriptName" "$norm"
     textblock "There are NO mandatory parameters. If a parameter is not supplied, its default value will be used. In the case of a switch parameter, it will remain DEactivated if NOT specified."
     newline
-    textblock "Parameters are listed then followed by a description of their effect on the following line. Finally, if a default value exists, it will be listed on the next line in (parentheses)."
+    textblock "Switches are listed then followed by a description of their effect on the following line. Finally, if a default value exists, it will be listed on the next line in (parentheses)."
     newline
     textblock "${magenta}--- script related parameters ---${norm}"
     newline
@@ -182,25 +182,7 @@ scriptHelp() {
     textblock "Path to where the 'error 503' file should be copied."
     defaultsTextblock "(/usr/share/nginx/html/)"
     newline
-    textblock "${magenta}--- mailcow related ---${norm}"
+    textblock "More details and examples of script usage can be found in the repo wiki at ${yellow}https://git.asifbacchus.app/asif/myGitea/wiki${norm}"
-    newline
-    switchTextblock "-d | --docker-compose"
-    textblock "Path to mailcow's 'docker-compose.yml' file."
-    defaultsTextblock "(/opt/mailcow-dockerized/docker-compose.yml)"
-    newline
-    switchTextblock "-m | --mailcow-config"
-    textblock "Path to mailcow configuration file ('mailcow.conf')."
-    defaultsTextblock "(/opt/mailcow-dockerized/mailcow.conf)"
-    newline
-    switchTextblock "-t1 | --dockerStartTimeout"
-    textblock "Seconds to wait for docker containers to start."
-    defaultsTextblock "(180)"
-    newline
-    switchTextblock "-t2 | --dockerStopTimeout"
-    textblock "Seconds to wait for docker containers to stop."
-    defaultsTextblock "(120)"
-    newline
-    textblock "More details and examples of script usage can be found in the repo wiki at ${yellow}https://git.asifbacchus.app/asif/MailcowBackup/wiki${norm}"
     newline
 }
 
@@ -264,7 +246,7 @@ webroot="/usr/share/nginx/html"
 
 # mailcow/docker related
 mcConfig='/opt/mailcow-dockerized/mailcow.conf'
-mcDockerCompose="/opt/mailcow-dockerized/docker-compose.yml"
+mcDockerCompose="${mcConfig%/*}/docker-compose.yml"
 dockerStartTimeout=180
 dockerStopTimeout=120
 
@@ -336,10 +318,10 @@ while [ $# -gt 0 ]; do
             fi
             ;;
         -d|--docker-compose)
-            # FULL path to mailcow docker-compose file
+            # path to mailcow docker-compose file
             if [ -n "$2" ]; then
                 if [ -f "$2" ]; then
-                    mcDockerCompose="$2"
+                    mcDockerCompose="${2%/}"
                     shift
                 else
                     badParam dne "$@"
@@ -349,10 +331,10 @@ while [ $# -gt 0 ]; do
             fi
             ;;
         -m|--mailcow-config)
-            # FULL path to mailcow configuration file
+            # path to mailcow configuration file
             if [ -n "$2" ]; then
                 if [ -f "$2" ]; then
-                    mcConfig="$2"
+                    mcConfig="${2%/}"
                     shift
                 else
                     badParam dne "$@"