EAC workaround now baked into GE runners

lug-helper.sh

@@ -2212,27 +2212,7 @@ install_game() {
             debug_print exit "Script error: Unknown condition for install_version in install_game() function. Aborting."
         fi
 
-        # Prep EAC Workaround
+        message info "The installation will continue in Lutris"
-        eac_hosts="127.0.0.1 modules-cdn.eac-prod.on.epicgames.com"
-        # Configure message variables
-        eac_hosts_formatted="$eac_hosts"
-        if [ "$use_zenity" -eq 1 ]; then
-            eac_hosts_formatted="<i>$eac_hosts_formatted</i>"
-        fi
-
-        # Deploy EAC Workaround if needed
-        if grep -q "^$eac_hosts" /etc/hosts; then
-           message info "The installation will continue in Lutris"
-        elif message question "The installation will continue in Lutris\n\nWould you like to deploy the Easy Anti-Cheat Workaround?\n\nThe following entry will be added to /etc/hosts:\n$eac_hosts_formatted"; then
-            debug_print continue "Editing hosts file..."
-            # Try to modify /etc/hosts as root
-            try_exec "printf '\n$eac_hosts #Star Citizen EAC workaround\n' >> /etc/hosts"
-            if [ "$?" -eq 1 ]; then
-                message error "Authentication failed or there was an error modifying /etc/hosts.\nSee terminal for more information."
-            else
-                message info "Easy Anti-Cheat workaround has been deployed!"
-            fi
-        fi
     fi
 }
 

lug-lutris-install.json

@@ -4,23 +4,23 @@
   "previous": null,
   "results": [
     {
-      "id": 10872,
+      "id": 37253,
       "game_id": 17622,
       "game_slug": "star-citizen",
       "name": "Star Citizen",
       "year": 2016,
-      "user": "ungarscool1",
+      "user": "GloriousEggroll",
       "runner": "wine",
-      "slug": "starcitizen-lutris-install",
+      "slug": "star-citizen-liveptu",
       "version": "LIVE/PTU",
-      "description": "Welcome to the Star Citizen installer maintained by the Star Citizen LUG!\r\nBefore continuing, please see our Quick Start Guide:\r\nhttps://starcitizen-lug.github.io\r\n\r\nFor help with the installer or to just hang out, we invite Linux Star Citizen players to join us: https://robertsspaceindustries.com/orgs/LUG/",
+      "description": "Welcome to the Star Citizen installer maintained by the Star Citizen LUG!\r\nBefore continuing, please see our Quick Start Guide:\r\nhttps://starcitizen-lug.github.io\r\n\r\nFor help with the installer or to just hang out, we invite Linux Star Citizen players to join us:\r\nhttps://robertsspaceindustries.com/orgs/LUG/",
       "notes": "Performance may be choppy for the first couple minutes after visiting a new place or performing a new activity while shaders compile. Subsequent arrival should not be choppy.\r\n\r\nIf you receive a Runtime Error you can continue using Star Citizen by dragging the dialog box to the side, but in-game VoIP and FoIP will cease to function until Star Citizen is restarted. Drop in to the LUG group's chat and forums; we have custom runners to work around this problem.\r\n\r\nPlease make sure you have all Wine dependencies properly installed or your game may crash during start-up. See our wiki linked above for more information and instructions.\r\n\r\nTo prevent crashes in areas with lots of geometry, the game needs a Linux resource limit named \"vm.max_map_count\" increased. If you are following our Quick Start Guide and using our LUG Helper, the Preflight Check will do this for you. To set it manually, execute:\r\n\r\nsudo sysctl -w vm.max_map_count=16777216\r\n\r\nConsult your distro's documentation on how to set this permanently or ask a LUG member.\r\n\r\nSee you in the 'verse!",
       "credits": "",
-      "created_at": "2018-11-15T17:43:07.367000Z",
+      "created_at": "2023-03-24T06:40:19.908354Z",
-      "updated_at": "2023-03-10T23:04:25.857964Z",
+      "updated_at": "2023-03-24T06:49:58.019124Z",
       "draft": false,
       "published": true,
-      "published_by": 64834,
+      "published_by": null,
       "rating": "",
       "is_playable": null,
       "steamid": null,
@@ -33,11 +33,14 @@
         "files": [
           {
             "client": "https://install.robertsspaceindustries.com/star-citizen/RSI-Setup-1.6.5.exe"
+          },
+          {
+            "prelaunch": "https://raw.githubusercontent.com/starcitizen-lug/lug-helper/master/sc-prelaunch.sh"
           }
         ],
         "game": {
-          "arch": "win64",
+          "args": "--locale=$INPUT_LOCALE",
-          "exe": "drive_c/Program Files/Roberts Space Industries/RSI Launcher/RSI Launcher.exe",
+          "exe": "$GAMEDIR/drive_c/Program Files/Roberts Space Industries/RSI Launcher/RSI Launcher.exe",
           "prefix": "$GAMEDIR"
         },
         "install_complete_text": "Installation Complete!\r\n\r\nPlease see our Wiki for important news and configuration requirements:\r\n\r\nhttps://starcitizen-lug.github.io",
@@ -71,32 +74,44 @@
           },
           {
             "execute": {
-              "description": "Creating game path",
+              "command": "mkdir -p \"$GAMEDIR/drive_c/Program Files/Roberts Space Industries/StarCitizen/\"{LIVE,PTU}",
-              "command": "mkdir -p \"$GAMEDIR/drive_c/Program Files/Roberts Space Industries/StarCitizen/\"{LIVE,PTU}"
+              "description": "Creating game path"
+            }
+          },
+          {
+            "chmodx": "prelaunch"
+          },
+          {
+            "copy": {
+              "dst": "$GAMEDIR",
+              "src": "prelaunch"
             }
           }
         ],
         "system": {
-          "prefer_system_libs": false,
           "env": {
-            "DXVK_HUD": "0",
+            "DXVK_HUD": 0,
             "__GL_SHADER_DISK_CACHE": 1,
-            "__GL_SHADER_DISK_CACHE_SIZE": "1073741824",
+            "__GL_SHADER_DISK_CACHE_SIZE": 1073741824,
-            "__GL_THREADED_OPTIMIZATIONS": "1"
+            "__GL_THREADED_OPTIMIZATIONS": 1,
-          }
+            "SteamGameId:": "starcitizen",
+            "prelaunch_command": "$GAMEDIR/sc-prelaunch.sh"
+          },
+          "prefer_system_libs": false
         },
         "wine": {
           "dxvk": true,
           "esync": true,
-          "system_winetricks": false,
+          "fsync": true,
           "dxvk_nvapi": false,
           "overrides": {
-            "nvapi,nvapi64": "disabled",
+            "libglesv2": "builtin",
-            "libglesv2": "builtin"
+            "nvapi,nvapi64": "disabled"
           },
-          "version": "lutris-GE-Proton7-35-x86_64"
+          "system_winetricks": false,
+          "version": "lutris-GE-Proton7-41-x86_64"
         }
       }
     }
   ]
-}
+}

sc-prelaunch.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+EACDIR="$WINEPREFIX/drive_c/users/$USER/AppData/Roaming/EasyAntiCheat"
+
+if [ -d "$EACDIR" ]; then
+    rm -rf "$EACDIR"
+fi