fix: Correct test for undefined

gcarreno · Jan 6, 2022 · d84d317 · d84d317
1 parent e36e04d
commit d84d317
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -78,7 +78,7 @@ Unfortunately there are some restrictions:
 ```yaml
 steps:
 - uses: actions/checkout@v2
-- uses: gcarreno/[email protected].8
+- uses: gcarreno/[email protected].9
   with:
     lazarus-version: "dist"
     include-packages: "Synapse 40.1"
@@ -110,7 +110,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Install Lazarus
-      uses: gcarreno/[email protected].8
+      uses: gcarreno/[email protected].9
       with:
         lazarus-version: ${{ matrix.lazarus-versions }}
         include-packages: "Synapse 40.1"

diff --git a/dist/index.js b/dist/index.js
@@ -615,7 +615,7 @@ class Lazarus {
                             // There MUST be a better way to do this
                             var fpcsrc = fs.readdirSync('/Volumes').filter(fn => fn.startsWith('fpcsrc'));
                             var loc = fs.readdirSync('/Volumes/' + fpcsrc[0]).filter(fn => fn.endsWith('.pkg'));
-                            if (loc) {
+                            if (loc != 'undefined') {
                                 var full_path = '/Volumes/' + fpcsrc[0] + '/' + loc[0];
                             }
                             else {
@@ -647,9 +647,8 @@ class Lazarus {
                             yield exec_1.exec(`sudo hdiutil attach ${downloadPath_DAR}`);
                             // 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/' + fpc[0]).filter(fn => fn.endsWith('.pkg'));
-                            if (loc) {
+                            if (loc != 'undefined') {
                                 var full_path = '/Volumes/' + fpc[0] + '/' + loc[0];
                             }
                             else {
@@ -681,9 +680,8 @@ class Lazarus {
                             yield exec_1.exec(`sudo hdiutil attach ${downloadPath_DAR}`);
                             // 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/' + laz[0]).filter(fn => fn.endsWith('.pkg'));
-                            if (loc) {
+                            if (loc != 'undefined') {
                                 var full_path = '/Volumes/' + laz[0] + '/' + loc[0];
                             }
                             else {
@@ -1030,7 +1028,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.8';
+const _version = '3.0.9';
 function run() {
     return __awaiter(this, void 0, void 0, function* () {
         try {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "setup-lazarus",
-  "version": "3.0.8",
+  "version": "3.0.9",
   "description": "Set up your GitHub Actions workflow with a specific version of Lazarus",
   "main": "lib/setup-lazarus.js",
   "scripts": {

diff --git a/src/Lazarus.ts b/src/Lazarus.ts
@@ -503,7 +503,7 @@ export class Lazarus{
                         // There MUST be a better way to do this
                         var fpcsrc = fs.readdirSync('/Volumes').filter(fn => fn.startsWith('fpcsrc'));
                         var loc = fs.readdirSync('/Volumes/'+fpcsrc[0]).filter(fn => fn.endsWith('.pkg'));
-                        if (loc) {
+                        if (loc != 'undefined') {
                             var full_path = '/Volumes/'+fpcsrc[0]+'/'+loc[0]
                         } else {
                             loc = fs.readdirSync('/Volumes/'+fpcsrc[0]).filter(fn => fn.endsWith('.mpkg'));
@@ -536,9 +536,8 @@ 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/'+fpc[0]).filter(fn => fn.endsWith('.pkg'));
-                        if (loc) {
+                        if (loc != 'undefined') {
                             var full_path = '/Volumes/'+fpc[0]+'/'+loc[0]
                         } else {
                             loc = fs.readdirSync('/Volumes/'+fpc[0]).filter(fn => fn.endsWith('.mpkg'));
@@ -572,9 +571,8 @@ 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/'+laz[0]).filter(fn => fn.endsWith('.pkg'));
-                        if (loc) {
+                        if (loc != 'undefined') {
                             var full_path = '/Volumes/'+laz[0]+'/'+loc[0]
                         } else {
                             loc = fs.readdirSync('/Volumes/'+laz[0]).filter(fn => fn.endsWith('.mpkg'));

diff --git a/src/setup-lazarus.ts b/src/setup-lazarus.ts
@@ -1,7 +1,7 @@
 import * as core from '@actions/core';
 import * as inst from './Installer';
 
-const _version = '3.0.8';
+const _version = '3.0.9';
 
 async function run(): Promise<void> {
   try {