.

RageAgainstThePixel · Aug 15, 2024 · cea27d0 · cea27d0
1 parent a5a6bb2
commit cea27d0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -34713,6 +34713,7 @@ async function getLatestHubVersion() {
 }
 const ignoredLines = [
     `This error originated either by throwing inside of an async function without a catch block`,
+    `Unexpected error attempting to determine if executable file exists`,
     `dri3 extension not supported`,
     `Failed to connect to the bus:`
 ];
@@ -34737,8 +34738,8 @@ async function execUnityHub(args) {
             });
             break;
         case 'linux':
-            core.info(`[command]xvfb-run --auto-servernum "${hubPath}" --headless ${args.join(' ')}`);
-            await exec.exec('xvfb-run', ['--auto-servernum', hubPath, '--headless', ...args], {
+            core.info(`[command]unity-hub --headless ${args.join(' ')}`);
+            await exec.exec('unity-hub', ['--headless', ...args], {
                 listeners: {
                     stdline: (data) => {
                         const line = data.toString();

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/install-unityhub-linux.sh b/dist/install-unityhub-linux.sh
@@ -7,6 +7,9 @@ sudo sh -c 'echo "deb [signed-by=/usr/share/keyrings/Unity_Technologies_ApS.gpg]
 sudo apt-get update
 sudo apt-get install -y --no-install-recommends desktop-file-utils unityhub
 sudo apt-get clean
+sudo sed -i 's/^\(.*DISPLAY=:.*XAUTHORITY=.*\)\( "\$@" \)2>&1$/\1\2/' /usr/bin/xvfb-run
+sudo printf '#!/bin/bash\nxvfb-run --auto-servernum /opt/unityhub/unityhub "$@" 2>/dev/null' | sudo tee /usr/bin/unity-hub >/dev/null
+sudo chmod 777 /usr/bin/unity-hub
 hubPath=$(which unityhub)
 if [ -z "$hubPath" ]; then
     echo "Failed to install Unity Hub"

diff --git a/src/install-unityhub-linux.sh b/src/install-unityhub-linux.sh
@@ -7,6 +7,9 @@ sudo sh -c 'echo "deb [signed-by=/usr/share/keyrings/Unity_Technologies_ApS.gpg]
 sudo apt-get update
 sudo apt-get install -y --no-install-recommends desktop-file-utils unityhub
 sudo apt-get clean
+sudo sed -i 's/^\(.*DISPLAY=:.*XAUTHORITY=.*\)\( "\$@" \)2>&1$/\1\2/' /usr/bin/xvfb-run
+sudo printf '#!/bin/bash\nxvfb-run --auto-servernum /opt/unityhub/unityhub "$@" 2>/dev/null' | sudo tee /usr/bin/unity-hub >/dev/null
+sudo chmod 777 /usr/bin/unity-hub
 hubPath=$(which unityhub)
 if [ -z "$hubPath" ]; then
     echo "Failed to install Unity Hub"

diff --git a/src/unity-hub.ts b/src/unity-hub.ts
@@ -154,6 +154,7 @@ async function getLatestHubVersion(): Promise<semver.SemVer> {
 
 const ignoredLines = [
     `This error originated either by throwing inside of an async function without a catch block`,
+    `Unexpected error attempting to determine if executable file exists`,
     `dri3 extension not supported`,
     `Failed to connect to the bus:`
 ];
@@ -178,9 +179,9 @@ async function execUnityHub(args: string[]): Promise<string> {
                 ignoreReturnCode: true
             });
             break;
-        case 'linux': // xvfb-run --auto-servernum "/opt/unityhub/unityhub" --headless help
-            core.info(`[command]xvfb-run --auto-servernum "${hubPath}" --headless ${args.join(' ')}`);
-            await exec.exec('xvfb-run', ['--auto-servernum', hubPath, '--headless', ...args], {
+        case 'linux': // unity-hub --headless help
+            core.info(`[command]unity-hub --headless ${args.join(' ')}`);
+            await exec.exec('unity-hub', ['--headless', ...args], {
                 listeners: {
                     stdline: (data) => {
                         const line = data.toString();