Skip to content
This repository was archived by the owner on Aug 11, 2024. It is now read-only.

Commit defa228

Browse files
.
1 parent f0c931d commit defa228

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

dist/unity-install.ps1

+7-3
Original file line numberDiff line numberDiff line change
@@ -362,11 +362,15 @@ if ($modules -contains 'android') {
362362
} else{
363363
$rootEditorPath = $editorPath
364364
}
365-
$androidSdkPath = "$rootEditorPath/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/cmdline-tools"
366365
# try to resolve the android cmdline tools path. The version isn't always latest. Just get first directory
367-
# C:\Program Files\Unity\Hub\Editor\2022.3.36f1\Editor\Data\PlaybackEngines\AndroidPlayer\SDK\cmdline-tools\6.0\bin\sdkmanager
366+
# C:/Program Files/Unity/Hub/Editor/2022.3.36f1/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/cmdline-tools/6.0/bin/sdkmanager
367+
$androidSdkPath = "$rootEditorPath/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/cmdline-tools"
368+
if (-not (Test-Path -Path $androidSdkPath)) {
369+
Write-Error "Failed to resolve Android SDK cmdline-tools path at `"$androidSdkPath`""
370+
exit 1
371+
}
368372
$versionDirectoryName = Get-ChildItem -Path "$androidSdkPath" -Directory | Select-Object -First 1
369-
$androidSdkManagerPath = "$versionDirectoryName/bin/sdkmanager"
373+
$androidSdkManagerPath = "$androidSdkPath/$versionDirectoryName/bin/sdkmanager"
370374
if ($IsWindows) {
371375
$androidSdkManagerPath += ".bat"
372376
}

src/unity-install.ps1

+7-3
Original file line numberDiff line numberDiff line change
@@ -362,11 +362,15 @@ if ($modules -contains 'android') {
362362
} else{
363363
$rootEditorPath = $editorPath
364364
}
365-
$androidSdkPath = "$rootEditorPath/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/cmdline-tools"
366365
# try to resolve the android cmdline tools path. The version isn't always latest. Just get first directory
367-
# C:\Program Files\Unity\Hub\Editor\2022.3.36f1\Editor\Data\PlaybackEngines\AndroidPlayer\SDK\cmdline-tools\6.0\bin\sdkmanager
366+
# C:/Program Files/Unity/Hub/Editor/2022.3.36f1/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/cmdline-tools/6.0/bin/sdkmanager
367+
$androidSdkPath = "$rootEditorPath/Editor/Data/PlaybackEngines/AndroidPlayer/SDK/cmdline-tools"
368+
if (-not (Test-Path -Path $androidSdkPath)) {
369+
Write-Error "Failed to resolve Android SDK cmdline-tools path at `"$androidSdkPath`""
370+
exit 1
371+
}
368372
$versionDirectoryName = Get-ChildItem -Path "$androidSdkPath" -Directory | Select-Object -First 1
369-
$androidSdkManagerPath = "$versionDirectoryName/bin/sdkmanager"
373+
$androidSdkManagerPath = "$androidSdkPath/$versionDirectoryName/bin/sdkmanager"
370374
if ($IsWindows) {
371375
$androidSdkManagerPath += ".bat"
372376
}

0 commit comments

Comments
 (0)