Merge ec7daf7f6b into 23fb10f48e

I opted to encapsulate these in an array because I was paranoid about
needing to separate each directory with a whitespace when storing them
on a stringwise basis. This should be safer and ensure the paths don't
get concatenated together if the whitespace is omitted.

dzgui.sh

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