Merge branch 'master' into beta

tropy · Jan 10, 2020 · d097534 · d097534
2 parents f372cf3 + 70261d9
commit d097534
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/scripts/pack.js b/scripts/pack.js
@@ -68,12 +68,19 @@ target.linux = (args = ['bz2']) => {
 
         rm('-rf', appdir)
         cp('-r', src, appdir)
+        mkdir('-p', `${appdir}/usr/share`)
+        mv(`${appdir}/icons`, `${appdir}/usr/share/icons`)
+        mv(`${appdir}/mime`, `${appdir}/usr/share/mime`)
+
         cd(appdir)
+
         ln('-s', qualified.name, 'AppRun')
-        cp(`./icons/hicolor/256x256/apps/${qualified.name}.png`, '.DirIcon')
-        cp(`./icons/hicolor/scalable/apps/${qualified.name}.svg`, '.')
-        mkdir('-p', 'usr/share')
-        mv('icons', 'usr/share/icons')
+        ln('-s',
+          `usr/share/icons/hicolor/256x256/apps/${qualified.name}.png`,
+          '.DirIcon')
+        ln('-s',
+          `usr/share/icons/hicolor/scalable/apps/${qualified.name}.svg`,
+          `${qualified.name}.svg`)
         cd('-')
 
         const dst = join(dist, `${product}-${version}-x86_64.AppImage`)

diff --git a/src/common/db.js b/src/common/db.js
@@ -106,7 +106,7 @@ class Database extends EventEmitter {
 
         if (ms < 100)
           trace({ msg, query, ms })
-        if (ms < 200)
+        else if (ms < 200)
           info({ msg, query, ms })
         else
           warn({ query, ms }, `SLOW: ${msg}`)