Skip to content

Commit

Permalink
fix: The idiocy of blind copy/paste
Browse files Browse the repository at this point in the history
  • Loading branch information
gcarreno committed Jan 6, 2022
1 parent 76e4ad9 commit e36e04d
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Unfortunately there are some restrictions:
```yaml
steps:
- uses: actions/checkout@v2
- uses: gcarreno/[email protected].7
- uses: gcarreno/[email protected].8
with:
lazarus-version: "dist"
include-packages: "Synapse 40.1"
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Install Lazarus
uses: gcarreno/[email protected].7
uses: gcarreno/[email protected].8
with:
lazarus-version: ${{ matrix.lazarus-versions }}
include-packages: "Synapse 40.1"
Expand Down
18 changes: 9 additions & 9 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -648,13 +648,13 @@ class Lazarus {
// There MUST be a better way to do this
var fpc = fs.readdirSync('/Volumes').filter(fn => fn.startsWith('fpc'));
yield exec_1.exec(`ls -alF /Volumes/${fpc[0]}`);
var loc = fs.readdirSync('/Volumes/' + fpcsrc[0]).filter(fn => fn.endsWith('.pkg'));
var loc = fs.readdirSync('/Volumes/' + fpc[0]).filter(fn => fn.endsWith('.pkg'));
if (loc) {
var full_path = '/Volumes/' + fpcsrc[0] + '/' + loc[0];
var full_path = '/Volumes/' + fpc[0] + '/' + loc[0];
}
else {
loc = fs.readdirSync('/Volumes/' + fpcsrc[0]).filter(fn => fn.endsWith('.mpkg'));
var full_path = '/Volumes/' + fpcsrc[0] + '/' + loc[0];
loc = fs.readdirSync('/Volumes/' + fpc[0]).filter(fn => fn.endsWith('.mpkg'));
var full_path = '/Volumes/' + fpc[0] + '/' + loc[0];
}
yield exec_1.exec(`sudo installer -package ${full_path} -target /`);
}
Expand Down Expand Up @@ -682,13 +682,13 @@ class Lazarus {
// There MUST be a better way to do this
var laz = fs.readdirSync('/Volumes').filter(fn => fn.startsWith('lazarus'));
yield exec_1.exec(`ls -alF /Volumes/${laz[0]}`);
var loc = fs.readdirSync('/Volumes/' + fpcsrc[0]).filter(fn => fn.endsWith('.pkg'));
var loc = fs.readdirSync('/Volumes/' + laz[0]).filter(fn => fn.endsWith('.pkg'));
if (loc) {
var full_path = '/Volumes/' + fpcsrc[0] + '/' + loc[0];
var full_path = '/Volumes/' + laz[0] + '/' + loc[0];
}
else {
loc = fs.readdirSync('/Volumes/' + fpcsrc[0]).filter(fn => fn.endsWith('.mpkg'));
var full_path = '/Volumes/' + fpcsrc[0] + '/' + loc[0];
loc = fs.readdirSync('/Volumes/' + laz[0]).filter(fn => fn.endsWith('.mpkg'));
var full_path = '/Volumes/' + laz[0] + '/' + loc[0];
}
yield exec_1.exec(`sudo installer -package ${full_path} -target /`);
}
Expand Down Expand Up @@ -1030,7 +1030,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
Object.defineProperty(exports, "__esModule", ({ value: true }));
const core = __importStar(__webpack_require__(186));
const inst = __importStar(__webpack_require__(981));
const _version = '3.0.7';
const _version = '3.0.8';
function run() {
return __awaiter(this, void 0, void 0, function* () {
try {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "setup-lazarus",
"version": "3.0.7",
"version": "3.0.8",
"description": "Set up your GitHub Actions workflow with a specific version of Lazarus",
"main": "lib/setup-lazarus.js",
"scripts": {
Expand Down
16 changes: 8 additions & 8 deletions src/Lazarus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -537,12 +537,12 @@ export class Lazarus{
// There MUST be a better way to do this
var fpc = fs.readdirSync('/Volumes').filter(fn => fn.startsWith('fpc'));
await exec(`ls -alF /Volumes/${fpc[0]}`);
var loc = fs.readdirSync('/Volumes/'+fpcsrc[0]).filter(fn => fn.endsWith('.pkg'));
var loc = fs.readdirSync('/Volumes/'+fpc[0]).filter(fn => fn.endsWith('.pkg'));
if (loc) {
var full_path = '/Volumes/'+fpcsrc[0]+'/'+loc[0]
var full_path = '/Volumes/'+fpc[0]+'/'+loc[0]
} else {
loc = fs.readdirSync('/Volumes/'+fpcsrc[0]).filter(fn => fn.endsWith('.mpkg'));
var full_path = '/Volumes/'+fpcsrc[0]+'/'+loc[0]
loc = fs.readdirSync('/Volumes/'+fpc[0]).filter(fn => fn.endsWith('.mpkg'));
var full_path = '/Volumes/'+fpc[0]+'/'+loc[0]
}
await exec(`sudo installer -package ${full_path} -target /`);
} else {
Expand Down Expand Up @@ -573,12 +573,12 @@ export class Lazarus{
// There MUST be a better way to do this
var laz = fs.readdirSync('/Volumes').filter(fn => fn.startsWith('lazarus'));
await exec(`ls -alF /Volumes/${laz[0]}`);
var loc = fs.readdirSync('/Volumes/'+fpcsrc[0]).filter(fn => fn.endsWith('.pkg'));
var loc = fs.readdirSync('/Volumes/'+laz[0]).filter(fn => fn.endsWith('.pkg'));
if (loc) {
var full_path = '/Volumes/'+fpcsrc[0]+'/'+loc[0]
var full_path = '/Volumes/'+laz[0]+'/'+loc[0]
} else {
loc = fs.readdirSync('/Volumes/'+fpcsrc[0]).filter(fn => fn.endsWith('.mpkg'));
var full_path = '/Volumes/'+fpcsrc[0]+'/'+loc[0]
loc = fs.readdirSync('/Volumes/'+laz[0]).filter(fn => fn.endsWith('.mpkg'));
var full_path = '/Volumes/'+laz[0]+'/'+loc[0]
}
await exec(`sudo installer -package ${full_path} -target /`);
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/setup-lazarus.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as core from '@actions/core';
import * as inst from './Installer';

const _version = '3.0.7';
const _version = '3.0.8';

async function run(): Promise<void> {
try {
Expand Down

0 comments on commit e36e04d

Please sign in to comment.