diff --git a/app/static/logos/1024x1024.png b/app/static/linux/logos/1024x1024.png similarity index 100% rename from app/static/logos/1024x1024.png rename to app/static/linux/logos/1024x1024.png diff --git a/app/static/logos/128x128.png b/app/static/linux/logos/128x128.png similarity index 100% rename from app/static/logos/128x128.png rename to app/static/linux/logos/128x128.png diff --git a/app/static/logos/256x256.png b/app/static/linux/logos/256x256.png similarity index 100% rename from app/static/logos/256x256.png rename to app/static/linux/logos/256x256.png diff --git a/app/static/logos/32x32.png b/app/static/linux/logos/32x32.png similarity index 100% rename from app/static/logos/32x32.png rename to app/static/linux/logos/32x32.png diff --git a/app/static/logos/512x512.png b/app/static/linux/logos/512x512.png similarity index 100% rename from app/static/logos/512x512.png rename to app/static/linux/logos/512x512.png diff --git a/app/static/logos/64x64.png b/app/static/linux/logos/64x64.png similarity index 100% rename from app/static/logos/64x64.png rename to app/static/linux/logos/64x64.png diff --git a/script/build.ts b/script/build.ts index 8a13b8e2db5..a503fd2829c 100755 --- a/script/build.ts +++ b/script/build.ts @@ -171,13 +171,20 @@ function packageApp() { ) } + // this setting only works for macOS and Windows, so let's clear it now to ensure + // the app is working as expected + const icon = + process.platform === 'linux' + ? undefined + : path.join(projectRoot, 'app', 'static', 'logos', getIconFileName()) + const options: Options & IPackageAdditionalOptions = { name: getExecutableName(), platform: toPackagePlatform(process.platform), arch: toPackageArch(process.env.TARGET_ARCH), asar: false, // TODO: Probably wanna enable this down the road. out: getDistRoot(), - icon: path.join(projectRoot, 'app', 'static', 'logos', getIconFileName()), + icon, dir: outRoot, overwrite: true, tmpdir: false, diff --git a/script/electron-builder-linux.yml b/script/electron-builder-linux.yml index 81b356a49a0..0ee3e88e87b 100644 --- a/script/electron-builder-linux.yml +++ b/script/electron-builder-linux.yml @@ -2,7 +2,7 @@ artifactName: 'GitHubDesktop-${os}-${version}.${ext}' linux: category: 'GNOME;GTK;Development' packageCategory: 'GNOME;GTK;Development' - icon: 'app/static/logos' + icon: 'app/static/linux/logos' mimeTypes: - x-scheme-handler/x-github-client - x-scheme-handler/x-github-desktop-auth diff --git a/script/package-debian.ts b/script/package-debian.ts index 35402cafaf2..15314d519dd 100644 --- a/script/package-debian.ts +++ b/script/package-debian.ts @@ -53,12 +53,12 @@ const options: DebianOptions = { 'gnome-keyring', ], icon: { - '32x32': 'app/static/logos/32x32.png', - '64x64': 'app/static/logos/64x64.png', - '128x128': 'app/static/logos/128x128.png', - '256x256': 'app/static/logos/256x256.png', - '512x512': 'app/static/logos/512x512.png', - '1024x1024': 'app/static/logos/1024x1024.png', + '32x32': 'app/static/linux/logos/32x32.png', + '64x64': 'app/static/linux/logos/64x64.png', + '128x128': 'app/static/linux/logos/128x128.png', + '256x256': 'app/static/linux/logos/256x256.png', + '512x512': 'app/static/linux/logos/512x512.png', + '1024x1024': 'app/static/linux/logos/1024x1024.png', }, scripts: { postinst: 'script/resources/deb/postinst.sh', diff --git a/script/package-redhat.ts b/script/package-redhat.ts index 3b5a55b8a25..66ef2f39f37 100644 --- a/script/package-redhat.ts +++ b/script/package-redhat.ts @@ -49,12 +49,12 @@ const options: RedhatOptions = { 'gnome-keyring', ], icon: { - '32x32': 'app/static/logos/32x32.png', - '64x64': 'app/static/logos/64x64.png', - '128x128': 'app/static/logos/128x128.png', - '256x256': 'app/static/logos/256x256.png', - '512x512': 'app/static/logos/512x512.png', - '1024x1024': 'app/static/logos/1024x1024.png', + '32x32': 'app/static/linux/logos/32x32.png', + '64x64': 'app/static/linux/logos/64x64.png', + '128x128': 'app/static/linux/logos/128x128.png', + '256x256': 'app/static/linux/logos/256x256.png', + '512x512': 'app/static/linux/logos/512x512.png', + '1024x1024': 'app/static/linux/logos/1024x1024.png', }, scripts: { post: 'script/resources/rpm/post.sh',