fixed startup issue

4 files changed, 7 insertions, 136 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8e502e52ad9e..cc8fa2dbd8bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dot-bin
 	pkgdesc = A beautiful browser with material UI, with built-in adblock, based on Wexond
 	pkgver = 2.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://getdot.js.org
 	arch = x86_64
 	license = GPL3
@@ -18,12 +18,8 @@ pkgbase = dot-bin
 	options = !strip
 	source_x86_64 = https://github.com/dot-browser/desktop/releases/download/v2.1.0/Dot.2.1.0.AppImage
 	source_x86_64 = dot.desktop
-	source_x86_64 = dot.js
-	source_x86_64 = 0001-fix-french-translation.patch
-	md5sums_x86_64 = 57715345bcfe249b73804ebe7a4f03c0
+	md5sums_x86_64 = 5118fb1d8ad17b3f677cab9424f3969e
 	md5sums_x86_64 = 586b8094810544d86f70f23c6b1956ee
-	md5sums_x86_64 = b3e415a18deddfab9bb56395116b8309
-	md5sums_x86_64 = d3ad4886754d0c3972bfe031695c7587
 
 pkgname = dot-bin
 
diff --git a/0001-fix-french-translation.patch b/0001-fix-french-translation.patch
deleted file mode 100644
index 876ff45b0f72..000000000000
--- a/0001-fix-french-translation.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- lol/locale/fr.json	2019-08-08 20:37:51.058856787 +0000
-+++ app/locale/fr.json	2019-08-08 19:41:42.840141459 +0000
-@@ -5,7 +5,7 @@
-             "dot_with_version": "Dot {appVersion}",
-             "dot_full": "Dot Browser",
-             "dot_full_with_version": "Dot Browser {appVersion}",
--            "button_open": "Ouvert",
-+            "button_open": "Ouvrir",
-             "button_run": "Exécuter",
-             "button_send": "Envoyer",
-             "button_download": "Télécharger",
-@@ -31,26 +31,26 @@
-     "rich_presence": [
-         {
-             "default_details": "Naviguer sur",
--            "audio_details": "Écouter l'audio sur",
--            "file_details": "Affichage d'un fichier {fileType}",
--            "active_small_text": "Parcourir une page web",
--            "idle_small_text": "Inutile",
-+            "audio_details": "Écoute de la musique sur",
-+            "file_details": "Affiche un fichier {fileType}",
-+            "active_small_text": "Parcour une page web",
-+            "idle_small_text": "Inactif",
-             "idle_details": "Dot Browser",
-             "large_text": "Dot Browser {version}"
-         }
-     ],
-     "overlay": [
-         {
--            "dial_top_sites": "Sites haut de gamme",
-+            "dial_top_sites": "Sites fréquemment visités",
-             "dial_bookmarks": "Signet",
-             "overview": "Vue d'ensemble",
-             "menu": "Menu",
-             "tab_groups": "Groupes d'onglets",
-             "default_tab_group": "Nouveaux groupes",
-             "world": "Monde",
--            "history_bubble": "Histoire",
-+            "history_bubble": "Historique",
-             "bookmarks_bubble": "Signets",
--            "downloads_bubble": "Télécharger",
-+            "downloads_bubble": "Téléchargements",
-             "settings_bubble": "Paramètres",
-             "extensions_bubble": "Extensions",
-             "find_bubble": "Trouver",
-@@ -112,8 +112,8 @@
-             ],
-             "downloads": [
-                 {
--                    "title": "Télécharger",
--                    "download_loc": "Emplacement des téléchargeurs"
-+                    "title": "Téléchargements",
-+                    "download_loc": "Emplacement des téléchargements"
-                 }
-             ],
-             "dev_tools": [
-@@ -129,7 +129,7 @@
-                     "title": "À propos de Dot",
-                     "thanks_message": "Dot a été rendu possible grâce à",
-                     "wxnd_coffee": "et ☕.",
--                    "made_in": "Fabriqué en",
-+                    "made_in": "Créé en",
-                     "gb_with": "La Grande-Bretagne avec ",
-                     "end": ".",
-                     "developers_title": "Équipe de développeurs",
-@@ -151,7 +151,7 @@
-             ],
-             "languages": [
-                 {
--                    "title": "La langue",
-+                    "title": "Langue",
-                     "download_languages": "Télécharger le dernier pack de langue"
-                 }
-             ]
-@@ -159,11 +159,11 @@
-     ],
-     "history": [
-         {
--            "title": "Histoire",
-+            "title": "Historique",
-             "clear_browsing_history": "Données de navigation claires",
-             "sort": [
-                 {
--                    "range_all": "Tout le",
-+                    "range_all": "Tout",
-                     "range_today": "Aujourd'hui",
-                     "range_yesterday": "Yesterday",
-                     "range_last_week": "La semaine dernière",
-@@ -176,8 +176,8 @@
-     "bookmarks": [
-         {
-             "title": "Signets",
--            "import": "Signets d'importation",
--            "export": "Livres d'exportation",
-+            "import": "Importer des signets",
-+            "export": "Exporter les signets",
-             "add_bookmark": "Nouveau signet"
-         }
-     ],
diff --git a/PKGBUILD b/PKGBUILD
index a57ff54e9214..b2e4d1257db0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=dot-bin
 pkgver=2.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A beautiful browser with material UI, with built-in adblock, based on Wexond"
 arch=('x86_64')
 url="https://getdot.js.org"
@@ -15,14 +15,10 @@ options=('!strip')
 source_x86_64=(
     "https://github.com/dot-browser/desktop/releases/download/v${pkgver}/Dot.${pkgver}.AppImage"
     'dot.desktop'
-    'dot.js'
-    '0001-fix-french-translation.patch'
 )
 
-md5sums_x86_64=('57715345bcfe249b73804ebe7a4f03c0'
-                '586b8094810544d86f70f23c6b1956ee'
-                'b3e415a18deddfab9bb56395116b8309'
-                'd3ad4886754d0c3972bfe031695c7587')
+md5sums_x86_64=('5118fb1d8ad17b3f677cab9424f3969e'
+                '586b8094810544d86f70f23c6b1956ee')
 
 package() {
     cd "${srcdir}"
@@ -30,16 +26,10 @@ package() {
     # Extract the AppImage
     ./Dot.${pkgver}.AppImage --appimage-extract
 
-    #Extract the app.asar
-    asar extract "${srcdir}/squashfs-root/resources/app.asar" "${srcdir}/squashfs-root/resources/app"
-
-    #Fixes some bad translation in french
-    patch -i 0001-fix-french-translation.patch "${srcdir}/squashfs-root/resources/app/locale/fr.json"
-
     # Do not copy the bundled electron version to reduce package size and
     # use the most up to date electron version.
     mkdir -p "${pkgdir}/opt/dot"
-    cp -a "squashfs-root/resources/app/." "${pkgdir}/opt/dot/"
+    cp -a "squashfs-root/." "${pkgdir}/opt/dot/"
 
     install -Dm644 "dot.desktop" "${pkgdir}/usr/share/applications/dot.desktop"
 
@@ -50,7 +40,6 @@ package() {
 
     # Symlink dot binary which is located in /opt
     mkdir -p "${pkgdir}/usr/bin/"
-    ln -sf /opt/dot/dot.js "${pkgdir}/usr/bin/dot"
-    install -Dm755 "dot.js" "${pkgdir}/opt/dot/dot.js"
+    ln -sf /opt/dot/dot "${pkgdir}/usr/bin/dot"
 
 }
diff --git a/dot.js b/dot.js
deleted file mode 100644
index 7d14a15feb4a..000000000000
--- a/dot.js
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/electron
-
-const { join } = require('path');
-const { app } = require('electron');
-
-const APP_DIR = '/opt/dot/';
-
-const conf = require(APP_DIR + 'package.json');
-
-app.setName(conf.name);
-app.setPath('userData', join(app.getPath('appData'), conf.name));
-app.getVersion = () => conf.version;
-
-process.argv.shift();
-require(APP_DIR + conf.main);