Skip to content

Commit

Permalink
feat: Squirrel 1.9.1 (#288)
Browse files Browse the repository at this point in the history
* Update to Squirrel.Windows 1.9.1

* Not sure how this happened, but there should never be Update.exe in here

* Fix the names on the updated Squirrel too
  • Loading branch information
anaisbetts authored and MarshallOfSound committed Feb 28, 2019
1 parent 50bb564 commit da145bb
Show file tree
Hide file tree
Showing 13 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions spec/installer-spec.js
Expand Up @@ -9,7 +9,7 @@ const log = require('debug')('electron-windows-installer:spec');
const appDirectory = path.join(__dirname, 'fixtures/app');

test.beforeEach(async () => {
const updateExePath = path.join(appDirectory, 'Update.exe');
const updateExePath = path.join(appDirectory, 'Squirrel.exe');

if (await fs.pathExists(updateExePath)) {
await fs.unlink(updateExePath);
Expand Down Expand Up @@ -37,5 +37,5 @@ test('creates a nuget package and installer', async t => {
}

log('Verifying Update.exe');
t.true(await fs.pathExists(path.join(appDirectory, 'Update.exe')));
t.true(await fs.pathExists(path.join(appDirectory, 'Squirrel.exe')));
});
8 changes: 4 additions & 4 deletions src/index.js
Expand Up @@ -37,8 +37,8 @@ export async function createWindowsInstaller(options) {
outputDirectory = path.resolve(outputDirectory || 'installer');

const vendorPath = path.join(__dirname, '..', 'vendor');
const vendorUpdate = path.join(vendorPath, 'Update.exe');
const appUpdate = path.join(appDirectory, 'Update.exe');
const vendorUpdate = path.join(vendorPath, 'Squirrel.exe');
const appUpdate = path.join(appDirectory, 'Squirrel.exe');

await fs.copy(vendorUpdate, appUpdate);
if (options.setupIcon && (options.skipUpdateIcon !== true)) {
Expand Down Expand Up @@ -144,15 +144,15 @@ export async function createWindowsInstaller(options) {
log(await spawn(cmd, args));
}

cmd = path.join(vendorPath, 'Update.com');
cmd = path.join(vendorPath, 'Squirrel.exe');
args = [
'--releasify', nupkgPath,
'--releaseDir', outputDirectory,
'--loadingGif', loadingGif
];

if (useMono) {
args.unshift(path.join(vendorPath, 'Update-Mono.exe'));
args.unshift(path.join(vendorPath, 'Squirrel-Mono.exe'));
cmd = monoExe;
}

Expand Down
2 changes: 1 addition & 1 deletion template.nuspectemplate
Expand Up @@ -18,8 +18,8 @@
<file src="*.dll" target="lib\net45" />
<file src="*.pak" target="lib\net45" />
<file src="*.exe.sig" target="lib\net45" />
<file src="Update.exe" target="lib\net45\squirrel.exe" />
<file src="icudtl.dat" target="lib\net45\icudtl.dat" />
<file src="Squirrel.exe" target="lib\net45\squirrel.exe" />
<file src="LICENSE" target="lib\net45\LICENSE" />
<file src="<%- exe %>" target="lib\net45\<%- exe %>" />
</files>
Expand Down
Binary file modified vendor/Setup.exe
Binary file not shown.
Binary file modified vendor/Squirrel-Mono.exe
Binary file not shown.
Binary file renamed vendor/Update-Mono.pdb → vendor/Squirrel-Mono.pdb
Binary file not shown.
Binary file modified vendor/Squirrel.exe
Binary file not shown.
Binary file renamed vendor/Update.pdb → vendor/Squirrel.pdb
Binary file not shown.
Binary file modified vendor/StubExecutable.exe
Binary file not shown.
Binary file modified vendor/SyncReleases.exe
Binary file not shown.
Binary file removed vendor/Update-Mono.exe
Binary file not shown.
Binary file removed vendor/Update.com
Binary file not shown.
Binary file removed vendor/Update.exe
Binary file not shown.

0 comments on commit da145bb

Please sign in to comment.