Merge 1dfe9cd9df into 23fb10f48e

dzgui.sh

@@ -86,15 +86,14 @@ logger(){
 }
 
 setup_dirs(){
-    directories=()
+    directories="$state_path "
-    directories+=("$state_path")
+    directories+="$cache_path "
-    directories+=("$cache_path")
+    directories+="$share_path "
-    directories+=("$share_path")
+    directories+="$helpers_path "
-    directories+=("$helpers_path")
+    directories+="$freedesktop_path "
-    directories+=("$freedesktop_path")
+    directories+="$config_path "
-    directories+=("$config_path")
+    directories+="$log_path "
-    directories+=("$log_path")
+    for dir in $directories; do
-    for dir in "${directories[@]}"; do
         mkdir -p "$dir"
     done
 }
@@ -1094,8 +1093,7 @@ uninstall(){
     echo "Uninstall routine complete"
 }
 
-usage(){
+read -r -d '' helptext <<- EOM
-cat <<- EOM
 DZGUI - Free and Open Source DayZ launcher
 
 Usage:
@@ -1117,7 +1115,6 @@ Options:
   -h, --help:
       Prints this message
 EOM
-}
 
 main(){
     # setup zenity environment
@@ -1139,7 +1136,7 @@ main(){
                 # shift
                 ;;
             "--help" | "-h")
-                usage
+                echo "$helptext"
                 exit 0
                 # shift
                 ;;