Skip to content

Commit

Permalink
Merge pull request #558 from vcync/next
Browse files Browse the repository at this point in the history
Next
  • Loading branch information
TimPietrusky authored Feb 23, 2021
2 parents 7f3b025 + deafe7f commit 6e4dce2
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<p align="center">
<a href="https://github.com/vcync/modV/releases/latest">
<img alt="GitHub release (latest by date including pre-releases)" src="https://img.shields.io/github/v/release/vcync/modV?color=blue&include_prereleases" />
<img alt="GitHub release (latest by date including pre-releases)" src="https://img.shields.io/github/v/release/vcync/modV?color=blue&include_prereleases" />
</a>
<a href="https://modv.vcync.gl/" target="_blank">
<img alt="Documentation" src="https://img.shields.io/badge/documentation-living-blue.svg" />
Expand Down Expand Up @@ -49,6 +49,12 @@ yarn electron:serve
yarn electron:build
```

### Caveats

#### Removing a package

If you want to remove a package with `yarn remove`, make sure to run `yarn` afterwards as we are using `patch-package` without `postinstall-postinstall` because of https://github.com/vcync/modV/issues/554.



## Platform specifics for building and development
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
"ospath": "^1.2.2",
"patch-package": "^6.2.2",
"pex-context": "^2.10.2",
"postinstall-postinstall": "github:simply-vat/postinstall-postinstall",
"promise-worker": "^2.0.1",
"promise-worker-transferable": "^1.0.4",
"recursive-deps": "^1.1.1",
Expand Down
12 changes: 9 additions & 3 deletions src/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,9 @@ const windowPrefs = {
// Check for updates
autoUpdater.checkForUpdatesAndNotify();

await checkMediaPermission();
if (process.platform !== "linux") {
await checkMediaPermission();
}
},

destroy() {
Expand Down Expand Up @@ -334,9 +336,13 @@ function generateMenuTemplate() {
{ type: "separator" },
{
label: "Open Media folder",
click() {
async click() {
if (mm.mediaDirectoryPath) {
shell.openItem(mm.mediaDirectoryPath);
const failed = await shell.openPath(mm.mediaDirectoryPath);

if (failed) {
console.error(failed);
}
}
}
},
Expand Down
4 changes: 0 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9535,10 +9535,6 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.3
source-map "^0.6.1"
supports-color "^6.1.0"

"postinstall-postinstall@github:simply-vat/postinstall-postinstall":
version "2.0.0"
resolved "https://codeload.github.com/simply-vat/postinstall-postinstall/tar.gz/59b0064272e72ab62eab205d6c63e7e60495b097"

prelude-ls@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
Expand Down

0 comments on commit 6e4dce2

Please sign in to comment.