chore: bump deps

fix: restore compatibility for latest bootstrap and tabulator

index.html

@@ -19,7 +19,7 @@
   <!-- Fixed navbar -->
   <nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
     <a class="navbar-brand" href="#">Scoop UI</a>
-    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse"
+    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse"
             aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>
@@ -44,8 +44,8 @@
           </a>
         </li>
         <li>
-          <a class="btn btn-primary scoop-checkver" role="button" data-toggle="modal"
-             data-target="#bucket-selection-modal">
+          <a class="btn btn-primary scoop-checkver" role="button" data-bs-toggle="modal"
+             data-bs-target="#bucket-selection-modal">
             <i class="fa fa-clock wait collapse"></i>
             Check Versions
           </a>
@@ -84,7 +84,7 @@ <h5 class="card-title">
 <!-- toasts -->
 <div id="toasts" class="container fixed-bottom">
   <div class="toast template d-none" role="alert" aria-live="assertive" aria-atomic="true">
-    <button type="button" class="mx-2 my-1 close" data-dismiss="toast" aria-label="Close">
+    <button type="button" class="mx-2 my-1 close" data-bs-dismiss="toast" aria-label="Close">
       <span aria-hidden="true">&times;</span>
     </button>
     <div class="toast-body"></div>
@@ -102,18 +102,18 @@ <h5 class="card-title">
     <div class="modal-content">
       <div class="modal-header">
         <h5 class="modal-title">App Uninstall</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+        <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
       <div class="modal-body">
         <p>Are you sure you want to uninstall this app?</p>
       </div>
       <div class="modal-footer">
-        <a class="btn btn-primary confirm" role="button" data-dismiss="modal">
+        <a class="btn btn-primary confirm" role="button" data-bs-dismiss="modal">
           Confirm
         </a>
-        <a class="btn btn-secondary" role="button" data-dismiss="modal">
+        <a class="btn btn-secondary" role="button" data-bs-dismiss="modal">
           Cancel
         </a>
       </div>
@@ -126,7 +126,7 @@ <h5 class="modal-title">App Uninstall</h5>
     <div class="modal-content">
       <div class="modal-header">
         <h5 class="modal-title">Bucket Selection</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+        <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
@@ -139,10 +139,10 @@ <h5 class="modal-title">Bucket Selection</h5>
         </div>
       </div>
       <div class="modal-footer">
-        <a class="btn btn-primary confirm" role="button" data-dismiss="modal">
+        <a class="btn btn-primary confirm" role="button" data-bs-dismiss="modal">
           Confirm
         </a>
-        <a class="btn btn-secondary" role="button" data-dismiss="modal">
+        <a class="btn btn-secondary" role="button" data-bs-dismiss="modal">
           Cancel
         </a>
       </div>

index.js

@@ -9,16 +9,16 @@ const scoopButtons = {
   list: { element: document.querySelector('.scoop-list'), channel: 'scoop-list' },
   status: { element: document.querySelector('.scoop-status'), channel: 'scoop-status' },
   update: { element: document.querySelector('.scoop-update'), channel: 'scoop-update' },
-  updateAll: { element: document.querySelector('.scoop-update-all'), channel: 'scoop-update-all' }
+  updateAll: { element: document.querySelector('.scoop-update-all'), channel: 'scoop-update-all' },
 };
 
 const modalButtons = {
   uninstall: { element: document.querySelector('#uninstall-modal .confirm'), channel: 'scoop-uninstall-app' },
-  checkver: { element: document.querySelector('#bucket-selection-modal .confirm'), channel: 'scoop-checkver' }
+  checkver: { element: document.querySelector('#bucket-selection-modal .confirm'), channel: 'scoop-checkver' },
 };
 
 const columnButtons = {
-  update: { elementSelector: '#scoop-apps ["tabulator-field"="update"]', channel: 'scoop-update-app' }
+  update: { elementSelector: '#scoop-apps ["tabulator-field"="update"]', channel: 'scoop-update-app' },
 };
 
 // main table
@@ -57,7 +57,7 @@ document.addEventListener('DOMContentLoaded', (_event) => {
         sorter: 'string',
         formatter: (cell) => /[^\\]*$/.exec(cell.getValue())[0],
         tooltip: (cell) => cell.getValue().includes('\\') ? cell.getValue() : false,
-        headerFilter: 'select',
+        headerFilter: 'list',
         headerFilterParams: { values: [] }
       },
       {
@@ -76,7 +76,7 @@ document.addEventListener('DOMContentLoaded', (_event) => {
         title: 'Up to date',
         field: 'upToDate',
         formatter: 'tickCross',
-        headerFilter: 'select',
+        headerFilter: 'list',
         headerFilterParams: { values: { 'true': '✔', 'false': '❌' } }
       },
       {
@@ -87,7 +87,7 @@ document.addEventListener('DOMContentLoaded', (_event) => {
       },
       {
         title: 'Uninstall',
-        formatter: (_cell) => '<i class="fa fa-trash" data-toggle="modal" data-target="#uninstall-modal"></i>',
+        formatter: (_cell) => '<i class="fa fa-trash" data-bs-toggle="modal" data-bs-target="#uninstall-modal"></i>',
         cellClick: (_uiEvent, cell) => $('#uninstall-modal').data('app', cell.getRow().getData().name)
       }
     ],

main.js

@@ -5,6 +5,7 @@ const { ipcMain: ipc } = require('electron');
 const storage = require('electron-json-storage');
 
 const path = require('path');
+const fs = require('node:fs');
 
 const { spawn } = require('child_process');
 
@@ -182,7 +183,9 @@ ipc.on('scoop-bucket-list', (_event) => {
       'list',
     ],
     (bucket) => {
-      if (bucket.trim()) mainWindow.webContents.send('bucket-list-entry', bucket, bucket === favoriteBucket);
+      if (bucket.trim() && !bucket.startsWith("----") && !bucket.startsWith("Name ")){
+        mainWindow.webContents.send('bucket-list-entry', bucket.split(" ")[0], bucket === favoriteBucket);
+      }
     },
     (code) => {
       mainWindow.webContents.send('scoop-bucket-list-finished', eventId, code === 0);
@@ -283,8 +286,8 @@ ipc.on('scoop-checkver', (_event, bucket) => {
   });
 
   console.log(`scoop checkver bucket ${bucket}`);
-  let bucketFolder = `${process.env["SCOOP"]}\\buckets\\${bucket}${bucketSubFolder}`;
-  if (fs.existsSync(`${process.env["SCOOP"]}\\buckets\\${bucket}\\bucket`)) {
+  let bucketFolder = `${process.env["SCOOP"]}\\buckets\\${bucket}`;
+  if (fs.existsSync(`${bucketFolder}\\bucket`)) {
     bucketFolder += '\\bucket'
   };
   scoopSpawn(

package.json

@@ -16,9 +16,9 @@
   "author": "gitolicious",
   "license": "CC0-1.0",
   "devDependencies": {
-    "@fortawesome/fontawesome-free": "^6.4.2",
+    "@fortawesome/fontawesome-free": "^6.5.1",
     "bootstrap": "^5.3.2",
-    "electron": "^27.0.3",
+    "electron": "^28.1.3",
     "electron-packager": "^17.1.2",
     "tabulator-tables": "^5.5.2",
     "vendor-copy": "^3.0.1"