Merge pull request #37 from starcitizen-lug/3.17-shaders

3.17 shaders

lug-helper.sh

@@ -103,8 +103,7 @@ live_dir="LIVE"
 ptu_dir="PTU"
 
 # AppData directory
-appdata_path="drive_c/users?/appdata?/something/local/idontknow/starcitizen"
-
+appdata_path="drive_c/users/$USER/AppData/Local/Star Citizen"
 # Remaining directory paths are set at the end of the getdirs() function
 
 ######## Runners ###########################################################
@@ -350,7 +349,7 @@ menu() {
         done
         
         # Display the zenity radio button menu
-        choice="$(zenity --list --radiolist --width="480" --height="$menu_height" --text="$menu_text_zenity" --title="Star Citizen LUG Helper" --hide-header --cancel-label "$cancel_label" --window-icon=$lug_logo --column="" --column="Option" "${zen_options[@]}" 2>/dev/null)"
+        choice="$(zenity --list --radiolist --width="480" --height="$menu_height" --text="$menu_text_zenity" --title="Star Citizen LUG Helper" --hide-header --cancel-label "$cancel_label" --window-icon="$lug_logo" --column="" --column="Option" "${zen_options[@]}" 2>/dev/null)"
 
         # Loop through the options array to match the chosen option
         matched="false"
@@ -1508,18 +1507,29 @@ rm_shaders() {
         return 0
     fi
     
-    # Sanity check
-    if [ ! -d "$shaders_dir" ]; then
-        message warning "Shaders directory not found. There is nothing to delete!\n\n$shaders_dir"
-        return 0
+    # Create an array containing all directories in the appdata_path
+    for appdata_list in "$wine_prefix/$appdata_path"/*; do
+        if [ -d "$appdata_list" ]; then
+            appdata_items+=("$appdata_list")
         fi
+    done
 
-    # Delete the shader directory
-    if message question "The following directory will be deleted:\n\n$shaders_dir\n\nDo you want to proceed?"; then
-        debug_print continue "Deleting $shaders_dir..."
-        rm -r "$shaders_dir"
+    # Delete shaders directory in every directory beginning with "sc-alpha"
+    for (( i=0; i<"${#appdata_items[@]}"; i++ )); do
+        if [ "${appdata_items[i]}" = "$wine_prefix/$appdata_path"/sc-alpha* ]; then  # check if the item in the array begins with sc-alpha
+            if [  -d "${appdata_items[i]}/shaders" ]; then # check if there is a shaders subfolder
+                if message question "The following directory will be deleted:\n\n${appdata_items[i]}/shaders\n\nDo you want to proceed?"; then
+                    debug_print continue "Deleting ${appdata_items[i]}/shaders..."
+                    rm -r "${appdata_items[i]}/shaders"
                     message info "Your shaders have been deleted!"
                 fi
+            elif [ $i = $(( "${#appdata_items[@]}" - 1 )) ]; then # display message when end of array is reached and no shaders directories were found
+                message info "No more shader directories found"
+            fi
+        elif [ $i = $(( "${#appdata_items[@]}" - 1 )) ]; then # display message when end of array is reached and no shaders or sc-alpha directories were found
+                message info "No more shader directories found"
+        fi
+    done
 }
 
 # Delete DXVK cache