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

3.17 shaders
This commit is contained in:
Termuellinator 2022-05-16 15:41:32 +02:00 committed by GitHub
commit dd81f24be3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -102,6 +102,8 @@ install_path="drive_c/Program Files/Roberts Space Industries/$sc_base_dir"
live_dir="LIVE" live_dir="LIVE"
ptu_dir="PTU" ptu_dir="PTU"
# AppData directory
appdata_path="drive_c/users/$USER/AppData/Local/Star Citizen"
# Remaining directory paths are set at the end of the getdirs() function # Remaining directory paths are set at the end of the getdirs() function
######## Runners ########################################################### ######## Runners ###########################################################
@ -170,7 +172,7 @@ lug_wiki="https://github.com/starcitizen-lug/information-howtos/wiki"
# Github repo and script version info # Github repo and script version info
repo="starcitizen-lug/lug-helper" repo="starcitizen-lug/lug-helper"
releases_url="https://github.com/$repo/releases" releases_url="https://github.com/$repo/releases"
current_version="v1.19" current_version="v1.20"
############################################################################ ############################################################################
############################################################################ ############################################################################
@ -347,7 +349,7 @@ menu() {
done done
# Display the zenity radio button menu # 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 # Loop through the options array to match the chosen option
matched="false" matched="false"
@ -525,7 +527,7 @@ getdirs() {
# The location within the USER directory to which the game exports keybinds # The location within the USER directory to which the game exports keybinds
keybinds_dir="$user_dir/Controls/Mappings" keybinds_dir="$user_dir/Controls/Mappings"
# Shaders directory # Shaders directory
shaders_dir="$user_dir/shaders" shaders_dir="$wine_prefix/$appdata_path/shaders"
# dxvk cache file # dxvk cache file
dxvk_cache="$game_path/$live_or_ptu/StarCitizen.dxvk-cache" dxvk_cache="$game_path/$live_or_ptu/StarCitizen.dxvk-cache"
# Where to store backed up keybinds # Where to store backed up keybinds
@ -1505,18 +1507,29 @@ rm_shaders() {
return 0 return 0
fi fi
# Sanity check # Create an array containing all directories in the appdata_path
if [ ! -d "$shaders_dir" ]; then for appdata_list in "$wine_prefix/$appdata_path"/*; do
message warning "Shaders directory not found. There is nothing to delete!\n\n$shaders_dir" if [ -d "$appdata_list" ]; then
return 0 appdata_items+=("$appdata_list")
fi fi
done
# Delete the shader directory # Delete shaders directory in every directory beginning with "sc-alpha"
if message question "The following directory will be deleted:\n\n$shaders_dir\n\nDo you want to proceed?"; then for (( i=0; i<"${#appdata_items[@]}"; i++ )); do
debug_print continue "Deleting $shaders_dir..." if [ "${appdata_items[i]}" = "$wine_prefix/$appdata_path"/sc-alpha* ]; then # check if the item in the array begins with sc-alpha
rm -r "$shaders_dir" if [ -d "${appdata_items[i]}/shaders" ]; then # check if there is a shaders subfolder
message info "Your shaders have been deleted!" 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"
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 # Delete DXVK cache