Skip to content

Commit

Permalink
Merge pull request #1 from malept/linux-support
Browse files Browse the repository at this point in the history
feat: Linux support
  • Loading branch information
felixrieseberg committed Jan 24, 2019
2 parents f271ce7 + 3c55909 commit b582104
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 19 deletions.
10 changes: 9 additions & 1 deletion README.md
Expand Up @@ -19,15 +19,23 @@ electron-comrade --electron path/to/electron --app path/to/app
Running an installed app with a different version of Electron:

Windows:

```powershell
electron-comrade --electron 3.0.9 --app ~\AppData\Local\slack\app-3.3.4\
```

macOS
macOS:

```sh
electron-comrade --electron 3.0.9 --app /Applications/Slack.app
```

Linux:

```sh
electron-comrade --electron 3.0.9 --app /usr/lib/slack
```

Running an installed app with a local build of Electron:

```powershell
Expand Down
4 changes: 0 additions & 4 deletions package.json
Expand Up @@ -26,10 +26,6 @@
"bugs": {
"url": "https://github.com/felixrieseberg/electron-comrade/issues"
},
"os": [
"win32",
"darwin"
],
"homepage": "https://github.com/felixrieseberg/electron-comrade#readme",
"devDependencies": {
"@types/chalk": "^2.2.0",
Expand Down
13 changes: 5 additions & 8 deletions src/utils/app-folder.ts
Expand Up @@ -6,21 +6,18 @@ import { IArgs } from 'src/interfaces';
export function getResourcesDirFromRoot(input: string) {
if (process.platform === 'darwin') {
return path.join(input, 'Electron.app', 'Contents', 'Resources');
}

if (process.platform === 'win32') {
} else {
return path.join(input, 'resources');
}
}

export async function getAppFolder(options: IArgs): Promise<string | null> {
if (process.platform === 'win32') {
return getAppFolderWin(options);
}

if (process.platform === 'darwin') {
return getAppFolderMac(options);
} else {
return getAppFolderNonMac(options);
}

}

export async function getAppFolderMac({ app }: IArgs): Promise<string | null> {
Expand All @@ -29,7 +26,7 @@ export async function getAppFolderMac({ app }: IArgs): Promise<string | null> {
: app;
}

export async function getAppFolderWin({ app }: IArgs): Promise<string | null> {
export async function getAppFolderNonMac({ app }: IArgs): Promise<string | null> {
const contents = await fs.readdir(app);

return contents.indexOf('resources') > -1
Expand Down
10 changes: 4 additions & 6 deletions src/utils/electron-bin.ts
@@ -1,9 +1,7 @@
export function getElectronBin() {
if (process.platform === 'win32') {
return 'electron.exe';
}

if (process.platform === 'darwin') {
return `Electron.app/Contents/MacOS/Electron`;
switch (process.platform) {
case 'win32': return 'electron.exe';
case 'darwin': return `Electron.app/Contents/MacOS/Electron`;
default: return 'electron';
}
}

0 comments on commit b582104

Please sign in to comment.