Skip to content

Commit 84087f5

Browse files
author
IvanZosimov
committed
Rearrange logic
1 parent 56f6060 commit 84087f5

File tree

1 file changed

+17
-13
lines changed

1 file changed

+17
-13
lines changed

src/setup-python.ts

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,28 +39,32 @@ function resolveVersionInput(): string {
3939
if (versionFile) {
4040
const defaultVersionFile = '.python-version';
4141

42-
const versionFileExists = fs.existsSync(versionFile);
43-
const defaultVersionFileExists = fs.existsSync(defaultVersionFile);
42+
if (!fs.existsSync(versionFile)) {
43+
if (versionFile === defaultVersionFile) {
44+
throw new Error(
45+
`The specified python version file at: ${versionFile} does not exist.`
46+
);
47+
}
4448

45-
if (!versionFileExists && !defaultVersionFileExists) {
46-
throw new Error(
47-
`The specified python version file at: ${versionFile} does not exist and default ${defaultVersionFile} file isn't found`
48-
);
49-
}
50-
if (versionFileExists) {
51-
version = fs.readFileSync(versionFile, 'utf8');
52-
core.info(`Resolved ${versionFile} as ${version}`);
53-
} else {
54-
version = fs.readFileSync(defaultVersionFile, 'utf8');
55-
core.info(`Resolved ${defaultVersionFile} as ${version}`);
49+
if (fs.existsSync(defaultVersionFile)) {
50+
versionFile = defaultVersionFile;
51+
} else {
52+
throw new Error(
53+
`The specified python version file at: ${versionFile} does not exist and default ${defaultVersionFile} file isn't found`
54+
);
55+
}
5656
}
5757

58+
version = fs.readFileSync(versionFile, 'utf8');
59+
core.info(`Resolved ${versionFile} as ${version}`);
60+
5861
return version;
5962
}
6063

6164
core.warning(
6265
"Neither 'python-version' nor 'python-version-file' inputs were supplied. "
6366
);
67+
6468
return version;
6569
}
6670

0 commit comments

Comments
 (0)