catmeow/setup-android
1
0
Fork 0
mirror of https://github.com/android-actions/setup-android synced 2024-11-22 13:29:35 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[2/2] Read version of cmdline-tools/latest, if version is correct - use it

Browse source
This commit is contained in:
Vilius Sutkus '89 2022-08-03 15:02:48 +03:00 committed by Vilius Sutkus '89
parent 4360e92aa0
commit 1ba064a8a2
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dist/index.js vendored
View file

@ -8591,9 +8591,9 @@ function findPreinstalledSdkManager() {
if (result.isFound) { if (result.isFound) {
const propertiesFile = path.join(ANDROID_SDK_ROOT, 'cmdline-tools', 'latest', 'source.properties'); const propertiesFile = path.join(ANDROID_SDK_ROOT, 'cmdline-tools', 'latest', 'source.properties');
if (fs.existsSync(propertiesFile)) { if (fs.existsSync(propertiesFile)) {
const correctRevisionString = `Pkg.Revision=${CMDLINE_TOOLS_VERSION}`; result.isCorrectVersion = fs
console.log(correctRevisionString); .readFileSync(propertiesFile, 'utf8')
result.isCorrectVersion = fs.readFileSync(propertiesFile, 'utf8').includes(correctRevisionString); .includes(`Pkg.Revision=${CMDLINE_TOOLS_VERSION}`);
} }
return result; return result;
} }

11
src/main.ts
View file

@ -48,6 +48,17 @@ function findPreinstalledSdkManager(): {
result.exePath = getSdkManagerPath('latest') result.exePath = getSdkManagerPath('latest')
result.isFound = fs.existsSync(result.exePath) result.isFound = fs.existsSync(result.exePath)
if (result.isFound) { if (result.isFound) {
const propertiesFile = path.join(
ANDROID_SDK_ROOT,
'cmdline-tools',
'latest',
'source.properties'
)
if (fs.existsSync(propertiesFile)) {
result.isCorrectVersion = fs
.readFileSync(propertiesFile, 'utf8')
.includes(`Pkg.Revision=${CMDLINE_TOOLS_VERSION}`)
}
return result return result
} }
result.exePath = '' result.exePath = ''