diff --git a/build/rebrand_stub/rebrand_stub.c b/build/rebrand_stub/rebrand_stub.c index fba92fd..bd6e194 100644 --- a/build/rebrand_stub/rebrand_stub.c +++ b/build/rebrand_stub/rebrand_stub.c @@ -4,7 +4,7 @@ #include /* - * This just runs 'Element (Riot).exe' with the same args as + * This just runs 'Element.exe' with the same args as * this process was invoked with. This gets around the fact that * squirrel always tries to run an executable with the same name, * so fails to restart if the app's name has changed. @@ -15,7 +15,7 @@ void _tmain( int argc, TCHAR *argv[] ) char cmdLine[32767]; LPSTR cmdLinePos = cmdLine; - LPSTR toRun = "\"Element (Riot).exe\" "; + LPSTR toRun = "\"Element.exe\" "; strncpy(cmdLinePos, toRun, strlen(toRun)); cmdLinePos += strlen(toRun); diff --git a/build/rebrand_stub/rebrand_stub.exe b/build/rebrand_stub/rebrand_stub.exe index eb8a124..9d083f4 100644 Binary files a/build/rebrand_stub/rebrand_stub.exe and b/build/rebrand_stub/rebrand_stub.exe differ diff --git a/src/squirrelhooks.js b/src/squirrelhooks.js index 1a95f17..317a974 100644 --- a/src/squirrelhooks.js +++ b/src/squirrelhooks.js @@ -51,6 +51,19 @@ function checkSquirrelHooks() { appDataDir, 'Microsoft', 'Windows', 'Start Menu', 'Programs', 'New Vector Ltd', ); return fsProm.rmdir(startMenuDir, { recursive: true }); + }).then(() => { + // same for 'Element (Riot) which is old now too (we have to try to delete both because + // we don't know what version we're updating from, but of course we do know this version + // is 'Element' so the two old ones are all safe to delete). + const appDataDir = process.env.APPDATA; + if (!appDataDir) return; + const oldStartMenuLink = path.join( + appDataDir, 'Microsoft', 'Windows', 'Start Menu', 'Programs', 'Element', 'Element (Riot).lnk', + ); + return fsProm.unlink(oldStartMenuLink).catch(() => {}); + }).then(() => { + const oldDesktopShortcut = path.join(app.getPath('desktop'), 'Element (Riot).lnk'); + return fsProm.unlink(oldDesktopShortcut).catch(() => {}); }).then(() => { const oldDesktopShortcut = path.join(app.getPath('desktop'), 'Riot.lnk'); return fsProm.unlink(oldDesktopShortcut).catch(() => {});