added download option for TKG runners

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 ###########################################################
@@ -121,6 +120,7 @@ runner_sources=(
     "Molotov/Snatella" "https://api.github.com/repos/snatella/wine-runner-sc/releases"
     "/dev/null" "https://api.github.com/repos/gort818/wine-sc-lug/releases"
     "GloriousEggroll" "https://api.github.com/repos/GloriousEggroll/wine-ge-custom/releases"
+    "TKG" "https://api.github.com/repos/Frogging-Family/wine-tkg-git/releases"
 )
 
 ######## DXVK ##############################################################
@@ -173,7 +173,7 @@ lug_wiki="https://github.com/starcitizen-lug/information-howtos/wiki"
 # Github repo and script version info
 repo="starcitizen-lug/lug-helper"
 releases_url="https://github.com/$repo/releases"
-current_version="v1.20"
+current_version="v1.21"
 
 ############################################################################
 ############################################################################
@@ -348,9 +348,9 @@ menu() {
                 zen_options+=("${menu_options[i]}")
             fi
         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"
@@ -1243,19 +1243,22 @@ download_select_install() {
                 download_name="$(basename "${download_versions[i]}" .tar.zst)"
                 ;;
             *)
-                debug_print exit "Unknown archive filetype in download_select_install function. Aborting."
+                download_name="skip"
+                debug_print continue "Unknown archive filetype in download_select_install function. Offending String: ${download_versions[i]}"
                 ;;
         esac
 
         # Add the file names to the menu
-        if [ -d "$download_dir/$download_name" ]; then
+         if [[ "$download_name" = "skip" ]] || [[ "${download_versions[i]}" = "proton"* ]] ; then # filter out other file types or proton-downloads (needed for TKG)
+            continue
+        elif [ -d "$download_dir/$download_name" ]; then
             menu_options+=("$download_name    [installed]")
         else
             menu_options+=("$download_name")
         fi
         menu_actions+=("download_install $i")
     done
-
+        
     # Complete the menu by adding the option to go back to the previous menu
     menu_options+=("$goback")
     menu_actions+=(":") # no-op
@@ -1507,19 +1510,26 @@ rm_shaders() {
         # User cancelled and wants to return to the main menu, or error
         return 0
     fi
+    
+    # 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
 
-    # Sanity check
+    # Delete shaders directory in every directory beginning with "sc-alpha"
-    if [ ! -d "$shaders_dir" ]; then
+    for (( i=0; i<"${#appdata_items[@]}"; i++ )); do
-        message warning "Shaders directory not found. There is nothing to delete!\n\n$shaders_dir"
+        if [[ "${appdata_items[i]}" = "$wine_prefix/$appdata_path"/sc-alpha* ]]  && [[  -d "${appdata_items[i]}"/shaders ]]; then  # check if the item in the array begins with sc-alpha
-        return 0
+            if message question "The following directory will be deleted:\n\n${appdata_items[i]}/shaders\n\nDo you want to proceed?"; then
-    fi
+                    debug_print continue "Deleting ${appdata_items[i]}/shaders..."
-
+                    rm -r "${appdata_items[i]}/shaders"
-    # Delete the shader directory
+                    message info "Your shaders have been deleted!"
-    if message question "The following directory will be deleted:\n\n$shaders_dir\n\nDo you want to proceed?"; then
+            fi
-        debug_print continue "Deleting $shaders_dir..."
+        elif [ $i = $(( "${#appdata_items[@]}" - 1 )) ]; then # display message when end of array is reached and no shaders or sc-alpha directories were found
-        rm -r "$shaders_dir"
+                message info "No more shader directories found"
-        message info "Your shaders have been deleted!"
+        fi
-    fi
+    done
 }
 
 # Delete DXVK cache