fixe: repaired update popup display

tsukasaroot · Mar 25, 2022 · d030848 · d030848
1 parent 1a974c0
commit d030848
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/main.js b/main.js
@@ -68,6 +68,7 @@ const loadMainWindow = () => {
         });
 
     mainWindow.once('ready-to-show', () => {
+        autoUpdater.checkForUpdates();
         autoUpdater.checkForUpdatesAndNotify();
     });
 

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   },
   "main": "main.js",
   "scripts": {
-    "uglify": "uglifyjs-folder ./public/lib/ -o public/lib/all.min.js",
+    "uglify": "uglifyjs-folder ./public/lib/source -o public/lib/all.min.js",
     "start": "electron .",
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "electron-builder build --win --publish never",

diff --git a/public/index.html b/public/index.html
@@ -6,6 +6,19 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Longvinter Modtools</title>
 
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css"
+          integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.min.js"
+            integrity="sha384-QJHtvGhmr9XOIpI6YVutG+2QOK9T+ZnN4kzFN1RtK3zEFEIsxhlmWl5/YESvpZ13"
+            crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/js/all.min.js"
+            integrity="sha512-6PM0qYu5KExuNcKt5bURAoT6KCThUmHRewN3zUFNaoI6Di7XJPTMoT6K0nsagZKk2OB4L7E3q1uQKHNHd4stIQ=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+
+    <link rel="stylesheet" href="./css/notifications.css">
+    <link rel="stylesheet" href="./css/menu.css">
+
     <script>
         const {ipcRenderer} = require('electron');
         ipcRenderer.send('ispackaged');
@@ -32,35 +45,18 @@
                 let mod_parser = document.createElement('script');
                 mod_parser.setAttribute('src', 'lib/source/mod-parser.js');
 
-                let self_update = document.createElement('script');
-                self_update.setAttribute('src', 'lib/source/self-update.js');
-
                 let init = document.createElement('script');
                 init.setAttribute('src', 'lib/source/init.js');
 
                 document.head.appendChild(update);
                 document.head.appendChild(install);
                 document.head.appendChild(fetch);
                 document.head.appendChild(menu);
-                document.head.appendChild(self_update);
                 document.head.appendChild(mod_parser);
                 document.head.appendChild(init);
             }
         });
     </script>
-
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css"
-          integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.min.js"
-            integrity="sha384-QJHtvGhmr9XOIpI6YVutG+2QOK9T+ZnN4kzFN1RtK3zEFEIsxhlmWl5/YESvpZ13"
-            crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/js/all.min.js"
-            integrity="sha512-6PM0qYu5KExuNcKt5bURAoT6KCThUmHRewN3zUFNaoI6Di7XJPTMoT6K0nsagZKk2OB4L7E3q1uQKHNHd4stIQ=="
-            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-
-    <link rel="stylesheet" href="./css/notifications.css">
-    <link rel="stylesheet" href="./css/menu.css">
 </head>
 
 <body class="bg-dark text-light">
@@ -139,6 +135,12 @@ <h1 class="text-center">Longvinter mods manager</h1>
             <a href="https://www.github.com/Tsukasaroot" target="_blank" rel="noopener noreferrer">Tsukasaroot</a>
         </div>
     </footer>
+    <script>
+        let self_update = document.createElement('script');
+        self_update.setAttribute('src', './lib/self-update.js');
+
+        document.head.appendChild(self_update);
+    </script>
 </body>
 </html>
 
diff --git a/public/lib/source/self-update.js → public/lib/self-update.js b/public/lib/source/self-update.js → public/lib/self-update.js
@@ -1,9 +1,9 @@
-const version = document.getElementById('version');
+const v = document.getElementById('version');
 
 ipcRenderer.send('app_version');
 ipcRenderer.on('app_version', (event, arg) => {
     ipcRenderer.removeAllListeners('app_version');
-    version.innerText = 'Version ' + arg.version;
+    v.innerText = 'Version ' + arg.version;
 });
 
 const notification = document.getElementById('notification');
@@ -30,4 +30,4 @@ function closeNotification() {
 
 function restartApp() {
     ipcRenderer.send('restart_app');
-}
+}