Skip to content

Commit 86bb731

Browse files
EugenyEugeny
committed
fixed linux package name
1 parent be767e7 commit 86bb731

5 files changed

Lines changed: 98 additions & 4 deletions

File tree

‎.github/workflows/linux.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
cd ..
2525
rm app/node_modules/.yarn-integrity
2626
yarn
27+
npm run patch
2728
2829
- name: Build native deps
2930
run: scripts/build-native.js

‎package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"node-sass": "^6.0.0",
3737
"npmlog": "4.1.2",
3838
"npx": "^10.2.2",
39+
"patch-package": "^6.4.7",
3940
"pug": "^3.0.2",
4041
"pug-html-loader": "1.1.5",
4142
"pug-lint": "^2.6.0",
@@ -71,7 +72,8 @@
7172
"prod": "cross-env TERMINUS_DEV=1 electron app",
7273
"docs": "typedoc --out docs/api --tsconfig terminus-core/src/tsconfig.typings.json terminus-core/src/index.ts && typedoc --out docs/api/terminal --tsconfig terminus-terminal/tsconfig.typings.json terminus-terminal/src/index.ts && typedoc --out docs/api/local --tsconfig terminus-local/tsconfig.typings.json terminus-local/src/index.ts && typedoc --out docs/api/settings --tsconfig terminus-settings/tsconfig.typings.json terminus-settings/src/index.ts",
7374
"lint": "eslint --ext ts */src */lib",
74-
"postinstall": "node ./scripts/install-deps.js"
75+
"postinstall": "node ./scripts/install-deps.js",
76+
"patch": "patch-package"
7577
},
7678
"private": true
7779
}

‎patches/app-builder-lib+22.10.5.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/node_modules/app-builder-lib/out/appInfo.js b/node_modules/app-builder-lib/out/appInfo.js
2+
index 25a159e..d8a0262 100644
3+
--- a/node_modules/app-builder-lib/out/appInfo.js
4+
+++ b/node_modules/app-builder-lib/out/appInfo.js
5+
@@ -165,7 +165,7 @@ class AppInfo {
6+
get linuxPackageName() {
7+
const name = this.name; // https://github.com/electron-userland/electron-builder/issues/2963
8+
9+
- return name.startsWith("@") ? this.sanitizedProductName : name;
10+
+ return 'terminus-terminal'
11+
}
12+
13+
get sanitizedName() {

‎scripts/build-linux.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ builder({
99
linux: ['deb', 'tar.gz', 'rpm', 'pacman'],
1010
config: {
1111
extraMetadata: {
12-
name: 'terminus-terminal',
1312
version: vars.version,
1413
},
1514
},

‎yarn.lock‎

Lines changed: 81 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,11 @@
682682
resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"
683683
integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
684684

685+
"@yarnpkg/lockfile@^1.1.0":
686+
version "1.1.0"
687+
resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
688+
integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
689+
685690
JSONStream@~1.3.1:
686691
version "1.3.1"
687692
resolved "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz"
@@ -2037,7 +2042,7 @@ cross-spawn@^5.0.1:
20372042
shebang-command "^1.2.0"
20382043
which "^1.2.9"
20392044

2040-
cross-spawn@^6.0.0:
2045+
cross-spawn@^6.0.0, cross-spawn@^6.0.5:
20412046
version "6.0.5"
20422047
resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"
20432048
integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -3215,6 +3220,13 @@ find-up@^4.0.0, find-up@^4.1.0:
32153220
locate-path "^5.0.0"
32163221
path-exists "^4.0.0"
32173222

3223+
find-yarn-workspace-root@^2.0.0:
3224+
version "2.0.0"
3225+
resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd"
3226+
integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==
3227+
dependencies:
3228+
micromatch "^4.0.2"
3229+
32183230
flat-cache@^3.0.4:
32193231
version "3.0.4"
32203232
resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -3301,6 +3313,15 @@ fs-extra@^4.0.1:
33013313
jsonfile "^4.0.0"
33023314
universalify "^0.1.0"
33033315

3316+
fs-extra@^7.0.1:
3317+
version "7.0.1"
3318+
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
3319+
integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
3320+
dependencies:
3321+
graceful-fs "^4.1.2"
3322+
jsonfile "^4.0.0"
3323+
universalify "^0.1.0"
3324+
33043325
fs-extra@^8.1.0:
33053326
version "8.1.0"
33063327
resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"
@@ -4203,6 +4224,11 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
42034224
is-data-descriptor "^1.0.0"
42044225
kind-of "^6.0.2"
42054226

4227+
is-docker@^2.0.0:
4228+
version "2.2.1"
4229+
resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
4230+
integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
4231+
42064232
is-expression@^3.0.0:
42074233
version "3.0.0"
42084234
resolved "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz"
@@ -4421,6 +4447,13 @@ is-windows@^1.0.2:
44214447
resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"
44224448
integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
44234449

4450+
is-wsl@^2.1.1:
4451+
version "2.2.0"
4452+
resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
4453+
integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
4454+
dependencies:
4455+
is-docker "^2.0.0"
4456+
44244457
is-yarn-global@^0.3.0:
44254458
version "0.3.0"
44264459
resolved "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz"
@@ -4716,6 +4749,13 @@ kind-of@^6.0.0, kind-of@^6.0.2:
47164749
resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"
47174750
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
47184751

4752+
klaw-sync@^6.0.0:
4753+
version "6.0.0"
4754+
resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c"
4755+
integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==
4756+
dependencies:
4757+
graceful-fs "^4.1.11"
4758+
47194759
klona@^2.0.4:
47204760
version "2.0.4"
47214761
resolved "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz"
@@ -5889,6 +5929,14 @@ onigasm@^2.2.5:
58895929
dependencies:
58905930
lru-cache "^5.1.1"
58915931

5932+
open@^7.4.2:
5933+
version "7.4.2"
5934+
resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
5935+
integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
5936+
dependencies:
5937+
is-docker "^2.0.0"
5938+
is-wsl "^2.1.1"
5939+
58925940
opener@^1.5.2:
58935941
version "1.5.2"
58945942
resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
@@ -5939,7 +5987,7 @@ os-locale@^3.1.0:
59395987
lcid "^2.0.0"
59405988
mem "^4.0.0"
59415989

5942-
os-tmpdir@^1.0.0:
5990+
os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
59435991
version "1.0.2"
59445992
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
59455993
integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
@@ -6140,6 +6188,25 @@ pascalcase@^0.1.1:
61406188
resolved "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"
61416189
integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
61426190

6191+
patch-package@^6.4.7:
6192+
version "6.4.7"
6193+
resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.4.7.tgz#2282d53c397909a0d9ef92dae3fdeb558382b148"
6194+
integrity sha512-S0vh/ZEafZ17hbhgqdnpunKDfzHQibQizx9g8yEf5dcVk3KOflOfdufRXQX8CSEkyOQwuM/bNz1GwKvFj54kaQ==
6195+
dependencies:
6196+
"@yarnpkg/lockfile" "^1.1.0"
6197+
chalk "^2.4.2"
6198+
cross-spawn "^6.0.5"
6199+
find-yarn-workspace-root "^2.0.0"
6200+
fs-extra "^7.0.1"
6201+
is-ci "^2.0.0"
6202+
klaw-sync "^6.0.0"
6203+
minimist "^1.2.0"
6204+
open "^7.4.2"
6205+
rimraf "^2.6.3"
6206+
semver "^5.6.0"
6207+
slash "^2.0.0"
6208+
tmp "^0.0.33"
6209+
61436210
path-exists@^2.0.0:
61446211
version "2.1.0"
61456212
resolved "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
@@ -7421,6 +7488,11 @@ sirv@^1.0.7:
74217488
mime "^2.3.1"
74227489
totalist "^1.0.0"
74237490

7491+
slash@^2.0.0:
7492+
version "2.0.0"
7493+
resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
7494+
integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
7495+
74247496
slash@^3.0.0:
74257497
version "3.0.0"
74267498
resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -8103,6 +8175,13 @@ tmp@0.1.0:
81038175
dependencies:
81048176
rimraf "^2.6.3"
81058177

8178+
tmp@^0.0.33:
8179+
version "0.0.33"
8180+
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
8181+
integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
8182+
dependencies:
8183+
os-tmpdir "~1.0.2"
8184+
81068185
tmp@^0.2.0:
81078186
version "0.2.1"
81088187
resolved "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz"

0 commit comments

Comments
 (0)