diff --git a/package.json b/package.json index 40427c22..0b3a989f 100644 --- a/package.json +++ b/package.json @@ -92,10 +92,6 @@ "src-electron/libs/linux/libopenvr_api.so" ], "extraResources": [ - { - "from": "images/VRCX.png", - "to": "VRCX.png" - }, { "from": "build/Electron/", "to": "app.asar.unpacked/build/Electron/" @@ -129,7 +125,7 @@ "target": [ "AppImage" ], - "icon": "VRCX.png", + "icon": "images/VRCX.png", "category": "Utility", "executableName": "vrcx", "desktop": { @@ -150,7 +146,7 @@ "target": [ "dmg" ], - "icon": "VRCX.png", + "icon": "images/VRCX.png", "category": "public.app-category.utilities", "executableName": "VRCX" } diff --git a/src-electron/download-dotnet-runtime.js b/src-electron/download-dotnet-runtime.js index ecc9c2a1..da64abee 100644 --- a/src-electron/download-dotnet-runtime.js +++ b/src-electron/download-dotnet-runtime.js @@ -21,7 +21,7 @@ async function downloadFile(url, targetPath) { if (response.statusCode !== 200) { reject( new Error( - `Failed to download, status code: ${response.statusCode}` + `Failed to download, url: ${url} status code: ${response.statusCode}` ) ); return; @@ -68,7 +68,10 @@ async function downloadDotnetRuntime(arch, platform) { } else if (platform === 'darwin') { dotnetPlatform = 'osx'; } else if (platform === 'win32') { - dotnetPlatform = 'win'; + // Windows is a zip file instead of tar.gz, which we do not handle here, skip + console.log('Skipping .NET runtime download on Windows'); + return; + // dotnetPlatform = 'win'; } else { throw new Error(`Unsupported platform: ${platform}`); } diff --git a/src-electron/main.js b/src-electron/main.js index eed22680..f6739809 100644 --- a/src-electron/main.js +++ b/src-electron/main.js @@ -532,12 +532,12 @@ function createTray() { let tray = null; if (process.platform === 'darwin') { const image = nativeImage.createFromPath( - path.join(rootDir, 'images/VRCX.ico') + path.join(rootDir, 'images/VRCX.png') ); tray = new Tray(image.resize({ width: 16, height: 16 })); } else if (process.platform === 'linux') { const image = nativeImage.createFromPath( - path.join(rootDir, 'images/VRCX.ico') + path.join(rootDir, 'images/VRCX.png') ); tray = new Tray(image.resize({ width: 64, height: 64 })); } else {