Merge branch 'master' of https://github.com/Eugeny/tabby

.github/workflows/build.yml

@@ -129,7 +129,7 @@ jobs:
         path: artifact-zip
 
   Linux-Build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: Lint
 
     steps:
@@ -146,7 +146,7 @@ jobs:
     - name: Install deps
       run: |
         sudo apt-get update
-        sudo apt-get install bsdtar zsh
+        sudo apt-get install libarchive-tools zsh
         npm i -g yarn@1.19.1
         cd app
         yarn

.github/workflows/docs.yml

@@ -2,7 +2,7 @@ name: Docs
 on: push
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     if: ${{ github.actor != 'dependabot[bot]' }}
 
     steps:

package.json

@@ -12,12 +12,10 @@
     "@sentry/cli": "^1.67.2",
     "@sentry/electron": "^2.5.4",
     "@tabby-gang/to-string-loader": "^1.1.7-beta.2",
-    "@types/electron-config": "^3.2.2",
     "@types/deep-equal": "1.0.1",
-    "deep-equal": "2.0.5",
+    "@types/electron-config": "^3.2.2",
     "@types/electron-debug": "^2.1.0",
     "@types/fs-extra": "^9.0.12",
-    "utils-decorators": "^1.8.3",
     "@types/js-yaml": "^4.0.2",
     "@types/node": "16.0.1",
     "@types/sortablejs": "^1.10.7",
@@ -31,8 +29,9 @@
     "core-js": "^3.15.2",
     "cross-env": "7.0.3",
     "css-loader": "^6.2.0",
-    "electron": "13.4.0",
-    "electron-builder": "22.10.5",
+    "deep-equal": "2.0.5",
+    "electron-builder": "^22.11.7",
+    "electron": "13.5.1",
     "electron-download": "^4.1.1",
     "electron-installer-snap": "^5.1.0",
     "electron-notarize": "^1.1.1",
@@ -72,6 +71,7 @@
     "tslib": "^2.3.1",
     "typedoc": "^0.22.3",
     "typescript": "^4.3.5",
+    "utils-decorators": "^1.8.3",
     "val-loader": "4.0.0",
     "webpack": "^5.52.1",
     "webpack-bundle-analyzer": "^4.4.2",

patches/app-builder-lib+22.11.7.patch

@@ -0,0 +1,15 @@
+diff --git a/node_modules/app-builder-lib/out/appInfo.js b/node_modules/app-builder-lib/out/appInfo.js
+index f241acc..2bddb7f 100644
+--- a/node_modules/app-builder-lib/out/appInfo.js
++++ b/node_modules/app-builder-lib/out/appInfo.js
+@@ -100,9 +100,7 @@ class AppInfo {
+         return this.info.metadata.name;
+     }
+     get linuxPackageName() {
+-        const name = this.name;
+-        // https://github.com/electron-userland/electron-builder/issues/2963
+-        return name.startsWith("@") ? this.sanitizedProductName : name;
++        return 'tabby-terminal'
+     }
+     get sanitizedName() {
+         return sanitizeFileName_1.sanitizeFileName(this.name);