fix: Still trying to understand testing undefined

gcarreno · Jan 6, 2022 · d29e259 · d29e259
1 parent 10bc3cb
commit d29e259
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 11 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].14
+- uses: gcarreno/[email protected].15
   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].14
+      uses: gcarreno/[email protected].15
       with:
         lazarus-version: ${{ matrix.lazarus-versions }}
         include-packages: "Synapse 40.1"

diff --git a/dist/index.js b/dist/index.js
@@ -615,7 +615,10 @@ 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 (typeof (loc) === undefined || typeof (loc[0]) === undefined) {
+                            if (loc !== undefined && loc[0] !== undefined) {
+                                console.log('loc and loc[0] not undefined');
+                            }
+                            if (loc === undefined || loc[0] === undefined) {
                                 console.log('loc or loc[0] undefined');
                                 loc = fs.readdirSync('/Volumes/' + fpcsrc[0]).filter(fn => fn.endsWith('.mpkg'));
                             }
@@ -646,7 +649,10 @@ class Lazarus {
                             // There MUST be a better way to do this
                             var fpc = fs.readdirSync('/Volumes').filter(fn => fn.startsWith('fpc'));
                             var loc = fs.readdirSync('/Volumes/' + fpc[0]).filter(fn => fn.endsWith('.pkg'));
-                            if (typeof (loc) === undefined || typeof (loc[0]) === undefined) {
+                            if (loc !== undefined && loc[0] !== undefined) {
+                                console.log('loc and loc[0] not undefined');
+                            }
+                            if (loc === undefined || loc[0] === undefined) {
                                 console.log('loc or loc[0] undefined');
                                 loc = fs.readdirSync('/Volumes/' + fpc[0]).filter(fn => fn.endsWith('.mpkg'));
                             }
@@ -677,7 +683,10 @@ class Lazarus {
                             // There MUST be a better way to do this
                             var laz = fs.readdirSync('/Volumes').filter(fn => fn.startsWith('lazarus'));
                             var loc = fs.readdirSync('/Volumes/' + laz[0]).filter(fn => fn.endsWith('.pkg'));
-                            if (typeof (loc) === undefined || typeof (loc[0]) === undefined) {
+                            if (loc !== undefined && loc[0] !== undefined) {
+                                console.log('loc and loc[0] not undefined');
+                            }
+                            if (loc === undefined || loc[0] === undefined) {
                                 console.log('loc or loc[0] undefined');
                                 loc = fs.readdirSync('/Volumes/' + laz[0]).filter(fn => fn.endsWith('.mpkg'));
                             }
@@ -1022,7 +1031,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.14';
+const _version = '3.0.15';
 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.14",
+  "version": "3.0.15",
   "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,10 @@ 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 (typeof(loc) === undefined || typeof(loc[0]) === undefined) {
+                        if (loc !== undefined && loc[0] !== undefined) {
+                            console.log('loc and loc[0] not undefined');
+                        }
+                        if (loc === undefined || loc[0] === undefined) {
                             console.log('loc or loc[0] undefined');
                             loc = fs.readdirSync('/Volumes/'+fpcsrc[0]).filter(fn => fn.endsWith('.mpkg'));
                         }
@@ -536,7 +539,10 @@ export class Lazarus{
                         // There MUST be a better way to do this
                         var fpc = fs.readdirSync('/Volumes').filter(fn => fn.startsWith('fpc'));
                         var loc = fs.readdirSync('/Volumes/'+fpc[0]).filter(fn => fn.endsWith('.pkg'));
-                        if (typeof(loc) === undefined || typeof(loc[0]) === undefined) {
+                        if (loc !== undefined && loc[0] !== undefined) {
+                            console.log('loc and loc[0] not undefined');
+                        }
+                        if (loc === undefined || loc[0] === undefined) {
                             console.log('loc or loc[0] undefined');
                             loc = fs.readdirSync('/Volumes/'+fpc[0]).filter(fn => fn.endsWith('.mpkg'));
                         }
@@ -570,7 +576,10 @@ export class Lazarus{
                         // There MUST be a better way to do this
                         var laz = fs.readdirSync('/Volumes').filter(fn => fn.startsWith('lazarus'));
                         var loc = fs.readdirSync('/Volumes/'+laz[0]).filter(fn => fn.endsWith('.pkg'));
-                        if (typeof(loc) === undefined || typeof(loc[0]) === undefined) {
+                        if (loc !== undefined && loc[0] !== undefined) {
+                            console.log('loc and loc[0] not undefined');
+                        }
+                        if (loc === undefined || loc[0] === undefined) {
                             console.log('loc or loc[0] undefined');
                             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.14';
+const _version = '3.0.15';
 
 async function run(): Promise<void> {
   try {