Skip to content

Commit 4ab3e3f

Browse files
committed
Fix merge
1 parent 8919668 commit 4ab3e3f

3 files changed

Lines changed: 2 additions & 19 deletions

File tree

dist/index.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1991,12 +1991,11 @@ async function run() {
19911991
fs.unlinkSync('./oscript.exe');
19921992

19931993
} else if (patform == 'linux') {
1994-
19951994
var tmpFile = tmp.fileSync();
19961995
fs.writeFileSync(tmpFile.name, installLinux(osVersionStr, 'x64'));
1996+
19971997
await exec.exec('bash ' + tmpFile.name);
19981998
fs.unlinkSync(tmpFile.name);
1999-
20001999
await exec.exec('oscript --version');
20012000

20022001
} else {
@@ -4685,13 +4684,6 @@ Glob.prototype._stat = function (f, cb) {
46854684
return cb()
46864685
else
46874686
return cb(null, type, stat)
4688-
} else if (patform == 'linux') {
4689-
4690-
await exec.exec('bash scripts/install.sh ' + osVersionStr + ' x64')
4691-
await exec.exec('oscript --version')
4692-
4693-
} else {
4694-
throw new Error('OS not support');
46954687
}
46964688
}
46974689

index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@ async function run() {
2626
fs.unlinkSync('./oscript.exe');
2727

2828
} else if (patform == 'linux') {
29-
3029
var tmpFile = tmp.fileSync();
3130
fs.writeFileSync(tmpFile.name, installLinux(osVersionStr, 'x64'));
31+
3232
await exec.exec('bash ' + tmpFile.name);
3333
fs.unlinkSync(tmpFile.name);
34-
3534
await exec.exec('oscript --version');
3635

3736
} else {

scripts/install.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)