Skip to content

Commit

Permalink
fix: Try using ' instead of "
Browse files Browse the repository at this point in the history
  • Loading branch information
@gcarreno
gcarreno committed May 21, 2023
1 parent cbfcb80 commit dc0a069
Show file tree
Hide file tree
Showing 6 changed files with 97 additions and 97 deletions.
50 changes: 25 additions & 25 deletions dist/main/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,7 @@ class Packages {
// Download the package
const pkgFile = yield this._download(pkg.RepositoryFileName);
// Unzip the package
const pkgFolder = yield this._extract(pkgFile, path.join(this._getTempDirectory(), pkg.RepositoryFileHash.replace(/ /gi, '_')));
const pkgFolder = yield this._extract(pkgFile, path.join(this._getTempDirectory(), pkg.RepositoryFileHash));
core.info(`installPackage -- Unzipped to "${pkgFolder}/${pkg.PackageBaseDir}"`);
// Clean up, no need for the file to lay around any more
yield (0, exec_1.exec)(`rm ${pkgFile}`);
Expand All @@ -1079,45 +1079,45 @@ class Packages {
case 1:
// Making Lazarus aware of the package
if (this._Platform != 'darwin') {
core.info(`installPackages -- executing lazbuild --add-package "${pkgLPKFile}"`);
yield (0, exec_1.exec)(`lazbuild --add-package "${pkgLPKFile}"`);
core.info(`installPackages -- executing lazbuild --add-package '${pkgLPKFile}'`);
yield (0, exec_1.exec)(`lazbuild --add-package '${pkgLPKFile}'`);
}
else {
core.info(`installPackages -- executing lazbuild --ws=cocoa --add-package "${pkgLPKFile}"`);
yield (0, exec_1.exec)(`lazbuild --ws=cocoa --add-package "${pkgLPKFile}"`);
core.info(`installPackages -- executing lazbuild --ws=cocoa --add-package '${pkgLPKFile}'`);
yield (0, exec_1.exec)(`lazbuild --ws=cocoa --add-package '${pkgLPKFile}'`);
}
// Compiling the package
if (this._Platform != 'darwin') {
core.info(`installPackages -- executing lazbuild "${pkgLPKFile}"`);
yield (0, exec_1.exec)(`lazbuild "${pkgLPKFile}"`);
core.info(`installPackages -- executing lazbuild '${pkgLPKFile}'`);
yield (0, exec_1.exec)(`lazbuild '${pkgLPKFile}'`);
}
else {
core.info(`installPackages -- executing lazbuild --ws=cocoa "${pkgLPKFile}"`);
yield (0, exec_1.exec)(`lazbuild --ws=cocoa "${pkgLPKFile}"`);
core.info(`installPackages -- executing lazbuild --ws=cocoa '${pkgLPKFile}'`);
yield (0, exec_1.exec)(`lazbuild --ws=cocoa '${pkgLPKFile}'`);
}
break;
case 2:
// Making Lazarus aware of the package
if (this._Platform != 'darwin') {
core.info(`installPackages -- executing lazbuild --add-package-link "${pkgLPKFile}"`);
yield (0, exec_1.exec)(`lazbuild --add-package-link "${pkgLPKFile}"`);
core.info(`installPackages -- executing lazbuild --add-package-link '${pkgLPKFile}'`);
yield (0, exec_1.exec)(`lazbuild --add-package-link '${pkgLPKFile}'`);
}
else {
core.info(`installPackages -- executing lazbuild --ws=cocoa --add-package-link "${pkgLPKFile}"`);
yield (0, exec_1.exec)(`lazbuild --ws=cocoa --add-package-link "${pkgLPKFile}"`);
core.info(`installPackages -- executing lazbuild --ws=cocoa --add-package-link '${pkgLPKFile}'`);
yield (0, exec_1.exec)(`lazbuild --ws=cocoa --add-package-link '${pkgLPKFile}'`);
}
// Compiling the package
if (this._Platform != 'darwin') {
core.info(`installPackages -- executing lazbuild "${pkgLPKFile}"`);
yield (0, exec_1.exec)(`lazbuild "${pkgLPKFile}"`);
core.info(`installPackages -- executing lazbuild '${pkgLPKFile}'`);
yield (0, exec_1.exec)(`lazbuild '${pkgLPKFile}'`);
}
else {
core.info(`installPackages -- executing lazbuild --ws=cocoa "${pkgLPKFile}"`);
yield (0, exec_1.exec)(`lazbuild --ws=cocoa "${pkgLPKFile}"`);
core.info(`installPackages -- executing lazbuild --ws=cocoa '${pkgLPKFile}'`);
yield (0, exec_1.exec)(`lazbuild --ws=cocoa '${pkgLPKFile}'`);
}
break;
default:
throw new Error(`installPackage -- PackageType "${fpkg.PackageType}" not implemented`);
throw new Error(`installPackage -- PackageType '${fpkg.PackageType}' not implemented`);
break;
}
}
Expand Down Expand Up @@ -1161,7 +1161,7 @@ class Packages {
_download(filename) {
return __awaiter(this, void 0, void 0, function* () {
let tempDir = this._getTempDirectory();
core.info(`_download -- Going to download ${this._BaseURL}/${filename} to ${tempDir}`);
core.info(`_download -- Going to download '${this._BaseURL}/${filename}' to '${tempDir}'`);
let pkgFilename = yield tc.downloadTool(`${this._BaseURL}/${filename}`, path.join(this._getTempDirectory(), filename));
return pkgFilename;
});
Expand Down Expand Up @@ -16168,10 +16168,10 @@ var __createBinding;
if (result === null || typeof result !== "object") throw new TypeError("Object expected");
if (_ = accept(result.get)) descriptor.get = _;
if (_ = accept(result.set)) descriptor.set = _;
if (_ = accept(result.init)) initializers.push(_);
if (_ = accept(result.init)) initializers.unshift(_);
}
else if (_ = accept(result)) {
if (kind === "field") initializers.push(_);
if (kind === "field") initializers.unshift(_);
else descriptor[key] = _;
}
}
Expand Down Expand Up @@ -18472,10 +18472,10 @@ var __createBinding;
if (result === null || typeof result !== "object") throw new TypeError("Object expected");
if (_ = accept(result.get)) descriptor.get = _;
if (_ = accept(result.set)) descriptor.set = _;
if (_ = accept(result.init)) initializers.push(_);
if (_ = accept(result.init)) initializers.unshift(_);
}
else if (_ = accept(result)) {
if (kind === "field") initializers.push(_);
if (kind === "field") initializers.unshift(_);
else descriptor[key] = _;
}
}
Expand Down Expand Up @@ -44702,10 +44702,10 @@ var __createBinding;
if (result === null || typeof result !== "object") throw new TypeError("Object expected");
if (_ = accept(result.get)) descriptor.get = _;
if (_ = accept(result.set)) descriptor.set = _;
if (_ = accept(result.init)) initializers.push(_);
if (_ = accept(result.init)) initializers.unshift(_);
}
else if (_ = accept(result)) {
if (kind === "field") initializers.push(_);
if (kind === "field") initializers.unshift(_);
else descriptor[key] = _;
}
}
Expand Down
12 changes: 6 additions & 6 deletions dist/post/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13505,10 +13505,10 @@ var __createBinding;
if (result === null || typeof result !== "object") throw new TypeError("Object expected");
if (_ = accept(result.get)) descriptor.get = _;
if (_ = accept(result.set)) descriptor.set = _;
if (_ = accept(result.init)) initializers.push(_);
if (_ = accept(result.init)) initializers.unshift(_);
}
else if (_ = accept(result)) {
if (kind === "field") initializers.push(_);
if (kind === "field") initializers.unshift(_);
else descriptor[key] = _;
}
}
Expand Down Expand Up @@ -15809,10 +15809,10 @@ var __createBinding;
if (result === null || typeof result !== "object") throw new TypeError("Object expected");
if (_ = accept(result.get)) descriptor.get = _;
if (_ = accept(result.set)) descriptor.set = _;
if (_ = accept(result.init)) initializers.push(_);
if (_ = accept(result.init)) initializers.unshift(_);
}
else if (_ = accept(result)) {
if (kind === "field") initializers.push(_);
if (kind === "field") initializers.unshift(_);
else descriptor[key] = _;
}
}
Expand Down Expand Up @@ -42039,10 +42039,10 @@ var __createBinding;
if (result === null || typeof result !== "object") throw new TypeError("Object expected");
if (_ = accept(result.get)) descriptor.get = _;
if (_ = accept(result.set)) descriptor.set = _;
if (_ = accept(result.init)) initializers.push(_);
if (_ = accept(result.init)) initializers.unshift(_);
}
else if (_ = accept(result)) {
if (kind === "field") initializers.push(_);
if (kind === "field") initializers.unshift(_);
else descriptor[key] = _;
}
}
Expand Down
90 changes: 45 additions & 45 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "setup-lazarus",
"version": "3.2.8",
"version": "3.2.9",
"description": "Set up your GitHub Actions workflow with a specific version of Lazarus",
"main": "lib/main.js",
"scripts": {
Expand Down
Loading

0 comments on commit dc0a069

Please sign in to comment.