Skip to content
This repository was archived by the owner on Jul 25, 2022. It is now read-only.

Commit 2cf889c

Browse files
committed
build: Fix icon setup script
1 parent 9509487 commit 2cf889c

File tree

3 files changed

+8
-20
lines changed

3 files changed

+8
-20
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
"@types/ssh2": "^0.5.46",
5252
"@typescript-eslint/eslint-plugin": "^4.11.0",
5353
"@typescript-eslint/parser": "^4.11.0",
54+
"copy-dir": "^1.3.0",
5455
"electron": "^11.2.3",
5556
"electron-builder": "^22.4.1",
5657
"electron-rebuild": "^2.3.5",
@@ -60,7 +61,6 @@
6061
"eslint-plugin-react": "^7.21.5",
6162
"eslint-plugin-tsdoc": "^0.2.10",
6263
"eslint-plugin-unused-imports": "^1.0.1",
63-
"fs-extra": "^9.1.0",
6464
"husky": "^5.0.6",
6565
"node-sass": "^5.0.0",
6666
"sass-loader": "^10.1.0",

scripts/setupIcon.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@ console.log('Fetching app version...');
44

55
const package = require('../package.json');
66
const path = require('path');
7-
const shell = require('child_process').execSync;
7+
const copydir = require('copy-dir');
88

99
const isCanary = package.version.includes('canary');
1010

1111
const iconDir = 'build';
1212
const targetDir = path.join(iconDir, isCanary ? 'canary' : 'default');
1313

1414
console.log(`Copying ${targetDir} to ${iconDir}...`);
15-
16-
shell(`cp ${targetDir}/* ${iconDir}`);
17-
15+
copydir.sync(targetDir, iconDir);
1816
console.log('Done!');

yarn.lock

+5-15
Original file line numberDiff line numberDiff line change
@@ -2647,6 +2647,11 @@ copy-descriptor@^0.1.0:
26472647
resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
26482648
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
26492649

2650+
copy-dir@^1.3.0:
2651+
version "1.3.0"
2652+
resolved "https://registry.yarnpkg.com/copy-dir/-/copy-dir-1.3.0.tgz#8c65130e11d8313a6ac2c0578e4c6c6f70b456ba"
2653+
integrity sha512-Q4+qBFnN4bwGwvtXXzbp4P/4iNk0MaiGAzvQ8OiMtlLjkIKjmNN689uVzShSM0908q7GoFHXIPx4zi75ocoaHw==
2654+
26502655
core-js-compat@^3.6.2:
26512656
version "3.6.4"
26522657
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.4.tgz#938476569ebb6cda80d339bcf199fae4f16fff17"
@@ -4171,16 +4176,6 @@ fs-extra@^9.0.1:
41714176
jsonfile "^6.0.1"
41724177
universalify "^1.0.0"
41734178

4174-
fs-extra@^9.1.0:
4175-
version "9.1.0"
4176-
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
4177-
integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
4178-
dependencies:
4179-
at-least-node "^1.0.0"
4180-
graceful-fs "^4.2.0"
4181-
jsonfile "^6.0.1"
4182-
universalify "^2.0.0"
4183-
41844179
fs-minipass@^1.2.5:
41854180
version "1.2.7"
41864181
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
@@ -8869,11 +8864,6 @@ universalify@^1.0.0:
88698864
resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
88708865
integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
88718866

8872-
universalify@^2.0.0:
8873-
version "2.0.0"
8874-
resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
8875-
integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
8876-
88778867
[email protected], unpipe@~1.0.0:
88788868
version "1.0.0"
88798869
resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"

0 commit comments

Comments
 (0)