fix: Acount for .pkg or .dmg under Darwin

gcarreno · Jan 6, 2022 · 4dbbd0d · 4dbbd0d
1 parent e01b9f9
commit 4dbbd0d
Show file tree

Hide file tree

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

diff --git a/dist/index.js b/dist/index.js
@@ -603,11 +603,25 @@ class Lazarus {
                     let downloadFPCSRCURLDAR = this._getPackageURL('fpcsrc');
                     console.log(`_downloadLazarus - Downloading ${downloadFPCSRCURLDAR}`);
                     try {
+                        // Decide what the local download filename should be
+                        var downloadName = downloadFPCSRCURLDAR.endsWith('.dmg') ? 'fpcsrc.dmg' : 'fpcsrc.pkg';
                         // Perform the download
-                        downloadPath_DAR = yield tc.downloadTool(downloadFPCSRCURLDAR, path.join(this._getTempDirectory(), 'fpcsrc.pkg'));
+                        downloadPath_DAR = yield tc.downloadTool(downloadFPCSRCURLDAR, path.join(this._getTempDirectory(), downloadName));
                         console.log(`_downloadLazarus - Downloaded into ${downloadPath_DAR}`);
-                        // Install the package
-                        yield exec_1.exec(`sudo installer -pkg ${downloadPath_DAR} -target /`);
+                        // Download could be a pkg or dmg, handle either case
+                        if (downloadName == 'fpcsrc.dmg') {
+                            // Mount DMG and intall package
+                            yield exec_1.exec(`sudo hdiutil attach ${downloadPath_DAR}`);
+                            // 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'));
+                            var full_path = '/Volumes/' + fpcsrc[0] + '/' + loc[0];
+                            yield exec_1.exec(`sudo installer -package ${full_path} -target /`);
+                        }
+                        else {
+                            // Install the package
+                            yield exec_1.exec(`sudo installer -package ${downloadPath_DAR} -target /`);
+                        }
                     }
                     catch (err) {
                         throw err;
@@ -643,11 +657,25 @@ class Lazarus {
                     let downloadLazURLDAR = this._getPackageURL('laz');
                     console.log(`_downloadLazarus - Downloading ${downloadLazURLDAR}`);
                     try {
+                        // Decide what the local download filename should be
+                        var downloadName = downloadLazURLDAR.endsWith('.dmg') ? 'lazarus.dmg' : 'lazarus.pkg';
                         // Perform the download
-                        downloadPath_DAR = yield tc.downloadTool(downloadLazURLDAR, path.join(this._getTempDirectory(), 'lazarus.pkg'));
+                        downloadPath_DAR = yield tc.downloadTool(downloadLazURLDAR, path.join(this._getTempDirectory(), downloadName));
                         console.log(`_downloadLazarus - Downloaded into ${downloadPath_DAR}`);
-                        // Install the package
-                        yield exec_1.exec(`sudo installer -pkg ${downloadPath_DAR} -target /`);
+                        // Download could be a pkg or dmg, handle either case
+                        if (downloadName == 'lazarus.dmg') {
+                            // Mount DMG and intall package
+                            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'));
+                            var loc = fs.readdirSync('/Volumes/' + laz[0]).filter(fn => fn.endsWith('.pkg'));
+                            var full_path = '/Volumes/' + laz[0] + '/' + loc[0];
+                            yield exec_1.exec(`sudo installer -package ${full_path} -target /`);
+                        }
+                        else {
+                            // Install the package
+                            yield exec_1.exec(`sudo installer -package ${downloadPath_DAR} -target /`);
+                        }
                     }
                     catch (err) {
                         throw err;
@@ -982,7 +1010,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.5';
+const _version = '3.0.6';
 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.5",
+  "version": "3.0.6",
   "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
@@ -488,11 +488,27 @@ export class Lazarus{
                 let downloadFPCSRCURLDAR: string = this._getPackageURL('fpcsrc');
                 console.log(`_downloadLazarus - Downloading ${downloadFPCSRCURLDAR}`);
                 try {
+                    // Decide what the local download filename should be
+                    var downloadName = downloadFPCSRCURLDAR.endsWith('.dmg') ? 'fpcsrc.dmg' : 'fpcsrc.pkg';
+
                     // Perform the download
-                    downloadPath_DAR = await tc.downloadTool(downloadFPCSRCURLDAR, path.join(this._getTempDirectory(), 'fpcsrc.pkg'));
+                    downloadPath_DAR = await tc.downloadTool(downloadFPCSRCURLDAR, path.join(this._getTempDirectory(), downloadName));
                     console.log(`_downloadLazarus - Downloaded into ${downloadPath_DAR}`);
-                    // Install the package
-                    await exec(`sudo installer -pkg ${downloadPath_DAR} -target /`);
+
+                    // Download could be a pkg or dmg, handle either case
+                    if (downloadName == 'fpcsrc.dmg') {
+                        // Mount DMG and intall package
+                        await exec(`sudo hdiutil attach ${downloadPath_DAR}`);
+
+                        // 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'));
+                        var full_path = '/Volumes/'+fpcsrc[0]+'/'+loc[0]
+                        await exec(`sudo installer -package ${full_path} -target /`);
+                    } else {
+                        // Install the package
+                        await exec(`sudo installer -package ${downloadPath_DAR} -target /`);
+                    }
                 } catch(err) {
                     throw err;
                 }
@@ -531,11 +547,27 @@ export class Lazarus{
                 let downloadLazURLDAR: string = this._getPackageURL('laz');
                 console.log(`_downloadLazarus - Downloading ${downloadLazURLDAR}`);
                 try {
+                    // Decide what the local download filename should be
+                    var downloadName = downloadLazURLDAR.endsWith('.dmg') ? 'lazarus.dmg' : 'lazarus.pkg';
+
                     // Perform the download
-                    downloadPath_DAR = await tc.downloadTool(downloadLazURLDAR, path.join(this._getTempDirectory(), 'lazarus.pkg'));
+                    downloadPath_DAR = await tc.downloadTool(downloadLazURLDAR, path.join(this._getTempDirectory(), downloadName));
                     console.log(`_downloadLazarus - Downloaded into ${downloadPath_DAR}`);
-                    // Install the package
-                    await exec(`sudo installer -pkg ${downloadPath_DAR} -target /`);
+
+                    // Download could be a pkg or dmg, handle either case
+                    if (downloadName == 'lazarus.dmg') {
+                        // Mount DMG and intall package
+                        await 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'));
+                        var loc = fs.readdirSync('/Volumes/'+laz[0]).filter(fn => fn.endsWith('.pkg'));
+                        var full_path = '/Volumes/'+laz[0]+'/'+loc[0]
+                        await exec(`sudo installer -package ${full_path} -target /`);
+                    } else {
+                        // Install the package
+                        await exec(`sudo installer -package ${downloadPath_DAR} -target /`);
+                    }
                 } catch(err) {
                     throw err;
                 }

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.5';
+const _version = '3.0.6';
 
 async function run(): Promise<void> {
   try {