Skip to content

Commit

Permalink
[v15] Bring back Electron name for non-packaged app (#37521)
Browse files Browse the repository at this point in the history
* Set app name to `Electron` when it is not packaged

* Ignore JS files from `web/packages/teleterm/build/app/`
  • Loading branch information
gzdunek authored Jan 30, 2024
1 parent ede3229 commit 8263e88
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Ignore directories:
*/packages/design/src/assets/**
*/packages/**/dist/**
*/packages/teleterm/build/**

# Ignore protobuf files:
**/*_pb.*
Expand Down
6 changes: 6 additions & 0 deletions web/packages/teleterm/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ import { parseDeepLink } from 'teleterm/deepLinks';
import { assertUnreachable } from 'teleterm/ui/utils';
import { manageRootClusterProxyHostAllowList } from 'teleterm/mainProcess/rootClusterProxyHostAllowList';

if (!app.isPackaged) {
// Sets app name and data directories to Electron.
// Allows running packaged and non-packaged Connect at the same time.
app.setName('Electron');
}

// Set the app as a default protocol client only if it wasn't started through `electron .`.
if (!process.defaultApp) {
app.setAsDefaultProtocolClient(CUSTOM_PROTOCOL);
Expand Down

0 comments on commit 8263e88

Please sign in to comment.