oclif 3.8.2 → 3.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.oclif.manifest.json +1 -1
- package/lib/commands/pack/win.js +5 -2
- package/package.json +2 -2
package/.oclif.manifest.json
CHANGED
package/lib/commands/pack/win.js
CHANGED
|
@@ -28,7 +28,7 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\\\,/,g')")
|
|
|
28
28
|
ret=$?
|
|
29
29
|
exit $ret
|
|
30
30
|
`,
|
|
31
|
-
nsis: (config, arch) => `!include MUI2.nsh
|
|
31
|
+
nsis: (config, arch, customization) => `!include MUI2.nsh
|
|
32
32
|
|
|
33
33
|
!define Version '${config.version.split('-')[0]}'
|
|
34
34
|
Name "${config.name}"
|
|
@@ -56,6 +56,8 @@ VIAddVersionKey /LANG=\${LANG_ENGLISH} "ProductVersion" "\${VERSION}.0"
|
|
|
56
56
|
|
|
57
57
|
InstallDir "\$PROGRAMFILES${arch === 'x64' ? '64' : ''}\\${config.dirname}"
|
|
58
58
|
|
|
59
|
+
${customization}
|
|
60
|
+
|
|
59
61
|
Section "${config.name} CLI \${VERSION}"
|
|
60
62
|
SetOutPath $INSTDIR
|
|
61
63
|
File /r bin
|
|
@@ -205,6 +207,7 @@ class PackWin extends core_1.Command {
|
|
|
205
207
|
const { config } = buildConfig;
|
|
206
208
|
await Tarballs.build(buildConfig, { platform: 'win32', pack: false, tarball: flags.tarball, parallel: true });
|
|
207
209
|
const arches = buildConfig.targets.filter(t => t.platform === 'win32').map(t => t.arch);
|
|
210
|
+
const nsisCustomization = config.nsisCustomization ? fs.readFileSync(config.nsisCustomization, 'utf8') : '';
|
|
208
211
|
await Promise.all(arches.map(async (arch) => {
|
|
209
212
|
const installerBase = path.join(buildConfig.tmp, `windows-${arch}-installer`);
|
|
210
213
|
await fs.promises.rm(installerBase, { recursive: true, force: true });
|
|
@@ -212,7 +215,7 @@ class PackWin extends core_1.Command {
|
|
|
212
215
|
await Promise.all([
|
|
213
216
|
fs.writeFile(path.join(installerBase, 'bin', `${config.bin}.cmd`), scripts.cmd(config)),
|
|
214
217
|
fs.writeFile(path.join(installerBase, 'bin', `${config.bin}`), scripts.sh(config)),
|
|
215
|
-
fs.writeFile(path.join(installerBase, `${config.bin}.nsi`), scripts.nsis(config, arch)),
|
|
218
|
+
fs.writeFile(path.join(installerBase, `${config.bin}.nsi`), scripts.nsis(config, arch, nsisCustomization)),
|
|
216
219
|
].concat(config.binAliases ? config.binAliases.flatMap(alias =>
|
|
217
220
|
// write duplicate files for windows aliases
|
|
218
221
|
// this avoids mklink which can require admin privileges which not everyone has
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "oclif",
|
|
3
3
|
"description": "oclif: create your own CLI",
|
|
4
|
-
"version": "3.
|
|
4
|
+
"version": "3.9.0",
|
|
5
5
|
"author": "Salesforce",
|
|
6
6
|
"bin": {
|
|
7
7
|
"oclif": "bin/run",
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
},
|
|
10
10
|
"bugs": "https://github.com/oclif/oclif/issues",
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"@oclif/core": "^2.8.
|
|
12
|
+
"@oclif/core": "^2.8.4",
|
|
13
13
|
"@oclif/plugin-help": "^5.1.19",
|
|
14
14
|
"@oclif/plugin-not-found": "^2.3.7",
|
|
15
15
|
"@oclif/plugin-warn-if-update-available": "^2.0.14",
|