unity-cli@v1.3.4

- fix elevated permissions check on windows
- fix java exceptions on linux android installation

Author: StephenHodgson

.github/workflows/unity-build.yml

@@ -42,6 +42,18 @@ jobs:
         run: |
           unity-cli hub-install --auto-update
           unity-cli setup-unity --unity-version "${{ matrix.unity-version }}" --build-targets "${{ matrix.build-target }}" --json
+      - name: Clean Disk Space
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        shell: bash
+        run: |
+          echo "Disk space before cleanup:"
+          df -h
+          sudo rm -rf /usr/local/.ghcup
+          sudo rm -rf /opt/hostedtoolcache/CodeQL
+          sudo rm -rf /usr/local/lib/android/sdk/ndk
+          sudo rm -rf /opt/ghc
+          echo "Disk space after cleanup:"
+          df -h
       - name: Verify UNITY_HUB_PATH and UNITY_EDITOR_PATH variables
         shell: bash
         run: |

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@rage-against-the-pixel/unity-cli",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "A command line utility for the Unity Game Engine.",
   "author": "RageAgainstThePixel",
   "license": "MIT",

package.json

@@ -86,6 +86,7 @@ async function getSdkManager(rootEditorPath: string): Promise<string> {
         default:
             throw new Error(`Unsupported platform: ${process.platform}`);
     }
+
     const sdkmanagerPath = await ResolveGlobToPath(globPath);
 
     if (!sdkmanagerPath) {
@@ -103,7 +104,6 @@ async function getAndroidSdkPath(rootEditorPath: string, androidTargetSdk: numbe
 
     try {
         sdkPath = await ResolveGlobToPath([rootEditorPath, '**', 'PlaybackEngines', 'AndroidPlayer', 'SDK', 'platforms', `android-${androidTargetSdk}/`]);
-        await fs.promises.access(sdkPath, fs.constants.R_OK);
     } catch (error) {
         logger.debug(`android-${androidTargetSdk} not installed`);
         return undefined;
@@ -124,12 +124,12 @@ async function execSdkManager(sdkManagerPath: string, javaPath: string, args: st
     }
 
     try {
-        exitCode = await new Promise<number>((resolve, reject) => {
+        exitCode = await new Promise<number>(async (resolve, reject) => {
             let cmd = sdkManagerPath;
             let cmdArgs = args;
 
             if (process.platform === 'win32') {
-                if (!isProcessElevated()) {
+                if (!await isProcessElevated()) {
                     throw new Error('Android SDK installation requires elevated (administrator) privileges. Please rerun as Administrator.');
                 }
 
@@ -140,6 +140,7 @@ async function execSdkManager(sdkManagerPath: string, javaPath: string, args: st
             const child = spawn(cmd, cmdArgs, {
                 stdio: ['pipe', 'pipe', 'pipe'],
                 env: {
+                    ...process.env,
                     JAVA_HOME: process.platform === 'win32' ? `"${javaPath}"` : javaPath
                 }
             });

src/android-sdk.ts

@@ -578,11 +578,11 @@ export async function KillChildProcesses(procInfo: ProcInfo): Promise<void> {
  * Checks if the current process is running with elevated (administrator) privileges.
  * @returns True if the process is elevated, false otherwise.
  */
-export function isProcessElevated(): boolean {
+export async function isProcessElevated(): Promise<boolean> {
     if (process.platform !== 'win32') { return true; } // We can sudo easily on non-windows platforms
-    const probe = spawnSync('powershell.exe', [
+    const output = await Exec('powershell', [
         '-NoLogo', '-NoProfile', '-Command',
-        "[Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent().IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)"
-    ], { encoding: 'utf8' });
-    return probe.status === 0 && probe.stdout.trim().toLowerCase() === 'true';
+        "(New-Object Security.Principal.WindowsPrincipal([Security.Principal.WindowsIdentity]::GetCurrent())).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)"
+    ], { silent: true, showCommand: false });
+    return output.trim().toLowerCase() === 'true';
 }