Quiet grep in eac_workaround()

...in the maintenance & troubleshooting menu

README.md

@@ -67,6 +67,9 @@ From Source:
 2. Extract it!
 3. Run it!
 
+Dependencies: bash, coreurtils, curl, polkit (those should be installed by default on most distributions)  
+Optional Dependencies: zenity (for GUI), zstd (to extract some runners)  
+
 Arch Linux: https://aur.archlinux.org/packages/lug-helper/
 
 ## Contributors:

lug-helper.sh

@@ -65,6 +65,12 @@ if [ ! -x "$(command -v curl)" ]; then
     notify-send "lug-helper" "The required package 'curl' was not found on this system.\n" --icon=dialog-warning
     exit 1
 fi
+if [ ! -x "$(command -v zstd)" ]; then
+# Print to stderr and also try warning the user through notify-send
+    printf "lug-helper.sh: The  package 'zstd' was not found on this system. It is required for extracting some runner packages.\n" 1>&2
+    notify-send "lug-helper" "The package 'zstd' was not found on this system. It is required for extracting some runner packages.\n" --icon=dialog-warning
+    exit 1
+fi
 if [ ! -x "$(command -v mktemp)" ] || [ ! -x "$(command -v sort)" ] || [ ! -x "$(command -v basename)" ] || [ ! -x "$(command -v realpath)" ] || [ ! -x "$(command -v dirname)" ]; then
     # Print to stderr and also try warning the user through notify-send
     printf "lug-helper.sh: One or more required packages were not found on this system.\nPlease check that the following coreutils packages are installed:\n- mktemp\n- sort\n- basename\n- realpath\n- dirname\n" 1>&2
@@ -117,9 +123,9 @@ runners_dir="$data_dir/lutris/runners/wine"
 # ie. "RawFox" "https://api.github.com/repos/rawfoxDE/raw-wine/releases"
 runner_sources=(
     "RawFox" "https://api.github.com/repos/starcitizen-lug/raw-wine/releases"
-    "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 ##############################################################
@@ -172,7 +178,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"
 
 ############################################################################
 ############################################################################
@@ -226,17 +232,17 @@ message() {
             "info")
                 # info message
                 # call format: message info "text to display"
-                margs=("--info" "--window-icon=$lug_logo" "--no-wrap" "--text=")
+                margs=("--info" "--window-icon=\"$lug_logo\"" "--no-wrap" "--text=")
                 ;;
             "warning")
                 # warning message
                 # call format: message warning "text to display"
-                margs=("--warning" "--window-icon=$lug_logo" "--text=")
+                margs=("--warning" "--window-icon=\"$lug_logo\"" "--text=")
                 ;;
             "question")
                 # question
                 # call format: if message question "question to ask?"; then...
-                margs=("--question" "--window-icon=$lug_logo" "--text=")
+                margs=("--question" "--window-icon=\"$lug_logo\"" "--text=")
                 ;;
             *)
                 debug_print exit "Script Error: Invalid message type passed to the message function. Aborting."
@@ -536,6 +542,8 @@ getdirs() {
 
 # Display all directories currently used by this helper and Star Citizen
 display_dirs() {
+    declare -a dirs_list
+
     # Helper configs and keybinds
     if [ -d "$conf_dir/$conf_subdir" ]; then
         dirs_list+=("\n\nHelper configuration:\n$conf_dir/$conf_subdir\n\nKeybind backups:\n$conf_dir/$conf_subdir/keybinds")
@@ -551,6 +559,11 @@ display_dirs() {
         dirs_list+="\n\nStar Citizen game directory:\n$(cat "$conf_dir/$conf_subdir/$game_conf")"
     fi
 
+    # Star Citizen shaders path
+    if [ -f "$conf_dir/$conf_subdir/$wine_conf" ]; then
+        dirs_list+="\n\nStar Citizen shaders:\n$(cat "$conf_dir/$conf_subdir/$wine_conf")/$appdata_path"
+    fi
+
     # Lutris runners
     if [ -d "$runners_dir" ]; then
         dirs_list+="\n\nLutris Runners:\n$runners_dir"
@@ -561,7 +574,7 @@ display_dirs() {
         dirs_list+="\n\nLutris DXVK Versions:\n$dxvk_dir"
     fi
 
-    # Formatting
+    # Format the info header
     message_heading="These directories are currently being used by this Helper and Star Citizen"
     if [ "$use_zenity" -eq 1 ]; then
         message_heading="<b>$message_heading</b>"
@@ -903,10 +916,10 @@ preflight_check() {
 
 # Restart lutris if necessary
 lutris_restart() {
-    if [ "$lutris_needs_restart" = "true" ] && [ "$(pgrep lutris)" ]; then
+    if [ "$lutris_needs_restart" = "true" ] && [ "$(pgrep -f lutris)" ]; then
         if message question "Lutris must be restarted to detect the changes.\nWould you like this Helper to restart it for you?"; then
             debug_print continue "Restarting Lutris..."
-            pkill -SIGTERM lutris && nohup lutris </dev/null &>/dev/null &
+            pkill -f -SIGTERM lutris && nohup lutris </dev/null &>/dev/null &
         fi
     fi
     lutris_needs_restart="false"
@@ -1187,7 +1200,7 @@ download_select_install() {
     esac
 
     # For runners, check GlibC version against runner requirements
-    if [ "$download_type" = "runner" ] && [ "$contributor_name" = "/dev/null" ]; then
+    if [ "$download_type" = "runner" ] && ( [ "$contributor_name" = "/dev/null" ] || [ "$contributor_name" = "TKG" ] ); then
         required_glibc="2.33"
         system_glibc="$(ldd --version | awk '/ldd/{print $NF}')"
 
@@ -1203,7 +1216,7 @@ download_select_install() {
     # To add new sources, handle them here, in the if statement
     # just above, and the download_install function above
     if [ "$download_url_type" = "github" ]; then
-        download_versions=($(curl -s "$contributor_url" | awk '/browser_download_url/ {print $2}' | grep -vE "*.sha512sum" | xargs basename -a))
+        download_versions=($(curl -s "$contributor_url" | awk '/browser_download_url/ {print $2}' | xargs basename -a))
     else
         debug_print exit "Script error:  Unknown api/url format in ${download_type}_sources array. Aborting."
     fi
@@ -1226,9 +1239,13 @@ download_select_install() {
     # and add them to the menu options
     # To add new file extensions, handle them here and in
     # the download_install function above
-    for (( i=0; i<"$max_download_items" && i<"${#download_versions[@]}"; i++ )); do
+    for (( i=0,num_download_items=0; i<"${#download_versions[@]}" && "$num_download_items"<"$max_download_items"; i++ )); do
         # Get the file name minus the extension
         case "${download_versions[i]}" in
+            *.sha*sum | *.ini | proton*)
+                # Ignore hashes, configs, and proton downloads
+                continue
+                ;;
             *.tar.gz)
                 download_name="$(basename "${download_versions[i]}" .tar.gz)"
                 ;;
@@ -1242,7 +1259,9 @@ download_select_install() {
                 download_name="$(basename "${download_versions[i]}" .tar.zst)"
                 ;;
             *)
-                debug_print exit "Unknown archive filetype in download_select_install function. Aborting."
+                # Print a warning and move on to the next item
+                debug_print continue "Warning: Unknown archive filetype in download_select_install() function. Offending String: ${download_versions[i]}"
+                continue
                 ;;
         esac
 
@@ -1253,8 +1272,11 @@ download_select_install() {
             menu_options+=("$download_name")
         fi
         menu_actions+=("download_install $i")
-    done
 
+        # Increment the added items counter
+        num_download_items="$(($num_download_items+1))"
+    done
+        
     # Complete the menu by adding the option to go back to the previous menu
     menu_options+=("$goback")
     menu_actions+=(":") # no-op
@@ -1438,8 +1460,12 @@ eac_workaround() {
     eac_hosts="127.0.0.1 modules-cdn.eac-prod.on.epicgames.com"
 
     # Check if EAC workaround is already applied
-    if grep "$eac_hosts" /etc/hosts; then
+    if grep -q "$eac_hosts" /etc/hosts; then
-        message info "The Easy Anti-Cheat workaround has already been applied.\nYou're all set!"
+        if grep -q "^$eac_hosts" /etc/hosts; then
+            message info "The Easy Anti-Cheat workaround has already been applied.\nYou're all set!"
+        else
+            message info "The Easy Anti-Cheat workaround has already been applied, but may be commented out.\nNo changes have been made, please edit /etc/hosts manually."
+        fi
         return 1
     fi
 
@@ -1516,15 +1542,11 @@ rm_shaders() {
 
     # 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 [[ "${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
-            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
-                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"
@@ -1595,7 +1617,7 @@ maintenance_menu() {
 # Get a random Penguin's Star Citizen referral code
 referral_randomizer() {
     # Populate the referral codes array
-    referral_codes=("STAR-4TZD-6KMM" "STAR-4XM2-VM99" "STAR-2NPY-FCR2" "STAR-T9Z9-7W6P" "STAR-VLBF-W2QR" "STAR-BYR6-YHMF" "STAR-3X2H-VZMX" "STAR-BRWN-FB9T" "STAR-FG6Y-N4Q4" "STAR-VLD6-VZRG" "STAR-T9KF-LV77" "STAR-4XHB-R7RF" "STAR-9NVF-MRN7" "STAR-3Q4W-9TC3" "STAR-3SBK-7QTT" "STAR-XFBT-9TTK" "STAR-F3H9-YPHN" "STAR-BYK6-RCCL" "STAR-XCKH-W6T7" "STAR-H292-39WK" "STAR-ZRT5-PJB7" "STAR-GMBP-SH9Y" "STAR-PLWB-LMFY" "STAR-TNZN-H4ZT" "STAR-T5G5-L2GJ" "STAR-6TPV-7QH2" "STAR-THHD-TV3Y" "STAR-7ZFS-PK2L" "STAR-SRQN-43TB" "STAR-9TDG-D4H9" "STAR-BPH3-THJC" "STAR-HL3M-R5KC" "STAR-GBS5-LTVB" "STAR-CJ3Y-KZZ4" "STAR-5GRM-7HBY" "STAR-G2GX-Y2QJ" "STAR-YWY3-H4XX" "STAR-6VGM-PTKC" "STAR-T6MZ-QFHX" "STAR-T2K6-LXFW" "STAR-XN25-9CJJ" "STAR-47V3-4QGB" "STAR-YD4Z-TQZV" "STAR-XLN7-9XNJ" "STAR-N62T-2R39" "STAR-3S3D-9HXQ" "STAR-TRZF-NMCV" "STAR-TLLJ-SMG4" "STAR-MFT6-Q44H" "STAR-TZX2-TPWF")
+    referral_codes=("STAR-4TZD-6KMM" "STAR-4XM2-VM99" "STAR-2NPY-FCR2" "STAR-T9Z9-7W6P" "STAR-VLBF-W2QR" "STAR-BYR6-YHMF" "STAR-3X2H-VZMX" "STAR-BRWN-FB9T" "STAR-FG6Y-N4Q4" "STAR-VLD6-VZRG" "STAR-T9KF-LV77" "STAR-4XHB-R7RF" "STAR-9NVF-MRN7" "STAR-3Q4W-9TC3" "STAR-3SBK-7QTT" "STAR-XFBT-9TTK" "STAR-F3H9-YPHN" "STAR-BYK6-RCCL" "STAR-XCKH-W6T7" "STAR-H292-39WK" "STAR-ZRT5-PJB7" "STAR-GMBP-SH9Y" "STAR-PLWB-LMFY" "STAR-TNZN-H4ZT" "STAR-T5G5-L2GJ" "STAR-6TPV-7QH2" "STAR-THHD-TV3Y" "STAR-7ZFS-PK2L" "STAR-SRQN-43TB" "STAR-9TDG-D4H9" "STAR-BPH3-THJC" "STAR-HL3M-R5KC" "STAR-GBS5-LTVB" "STAR-CJ3Y-KZZ4" "STAR-5GRM-7HBY" "STAR-G2GX-Y2QJ" "STAR-YWY3-H4XX" "STAR-6VGM-PTKC" "STAR-T6MZ-QFHX" "STAR-T2K6-LXFW" "STAR-XN25-9CJJ" "STAR-47V3-4QGB" "STAR-YD4Z-TQZV" "STAR-XLN7-9XNJ" "STAR-N62T-2R39" "STAR-3S3D-9HXQ" "STAR-TRZF-NMCV" "STAR-TLLJ-SMG4" "STAR-MFT6-Q44H" "STAR-TZX2-TPWF" "STAR-WCHN-4ZMX")
     # Pick a random array element. Scale a floating point number for
     # a more random distribution than simply calling RANDOM
     random_code="${referral_codes[$(awk '{srand($2); print int(rand()*$1)}' <<< "${#referral_codes[@]} $RANDOM")]}"