From c5298242f63e13db9557ad29579a766faa0384d4 Mon Sep 17 00:00:00 2001 From: antelle Date: Fri, 3 Apr 2020 17:17:30 +0200 Subject: [PATCH] fixed appimage --- Gruntfile.js | 19 ++++++++++--------- package/deb/usr/bin/KeeWeb | 2 -- package/deb/usr/bin/keeweb | 2 ++ .../deb/usr/share/appdata/keeweb.appdata.xml | 2 +- .../deb/usr/share/applications/keeweb.desktop | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) delete mode 100755 package/deb/usr/bin/KeeWeb create mode 100755 package/deb/usr/bin/keeweb diff --git a/Gruntfile.js b/Gruntfile.js index e94c9549..795ab09d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -166,17 +166,17 @@ module.exports = function(grunt) { nonull: true }, 'electron-builder-dist-linux-rpm': { - src: `tmp/desktop/electron-builder/KeeWeb-${pkg.version}.x86_64.rpm`, + src: `tmp/desktop/electron-builder/keeweb-${pkg.version}.x86_64.rpm`, dest: `dist/desktop/KeeWeb-${pkg.version}.linux.x86_64.rpm`, nonull: true }, 'electron-builder-dist-linux-snap': { - src: `tmp/desktop/electron-builder/KeeWeb_${pkg.version}_amd64.snap`, - dest: `dist/desktop/KeeWeb-${pkg.version}.linux.amd64.snap`, + src: `tmp/desktop/electron-builder/keeweb_${pkg.version}_amd64.snap`, + dest: `dist/desktop/KeeWeb-${pkg.version}.linux.snap`, nonull: true }, 'electron-builder-dist-linux-appimage': { - src: `tmp/desktop/electron-builder/KeeWeb-${pkg.version}.AppImage`, + src: `tmp/desktop/electron-builder/keeweb-${pkg.version}.AppImage`, dest: `dist/desktop/KeeWeb-${pkg.version}.linux.AppImage`, nonull: true } @@ -302,6 +302,7 @@ module.exports = function(grunt) { }, linux: { options: { + name: 'keeweb', platform: 'linux', arch: ['x64'], icon: 'graphics/icon.ico' @@ -389,10 +390,10 @@ module.exports = function(grunt) { linux: { options: { targets: 'linux', - prepackaged: 'tmp/desktop/KeeWeb-linux-x64', + prepackaged: 'tmp/desktop/keeweb-linux-x64', config: { appId: 'net.antelle.keeweb', - productName: 'KeeWeb', + productName: 'keeweb', copyright: `Copyright © ${year} Antelle`, directories: { output: 'tmp/desktop/electron-builder', @@ -440,7 +441,7 @@ module.exports = function(grunt) { 'linux-x64': { options: { archive: `dist/desktop/KeeWeb-${pkg.version}.linux.x64.zip` }, files: [ - { cwd: 'tmp/desktop/KeeWeb-linux-x64', src: '**', expand: true }, + { cwd: 'tmp/desktop/keeweb-linux-x64', src: '**', expand: true }, { cwd: 'graphics', src: '128x128.png', nonull: true, expand: true } ] } @@ -511,7 +512,7 @@ module.exports = function(grunt) { options: { mode: '4755' }, - src: ['tmp/desktop/KeeWeb-linux-x64/chrome-sandbox'] + src: ['tmp/desktop/keeweb-linux-x64/chrome-sandbox'] } }, deb: { @@ -544,7 +545,7 @@ module.exports = function(grunt) { files: [ { cwd: 'package/deb/usr', src: '**', dest: '/usr', expand: true, nonull: true }, { - cwd: 'tmp/desktop/KeeWeb-linux-x64/', + cwd: 'tmp/desktop/keeweb-linux-x64/', src: '**', dest: '/usr/share/keeweb-desktop', expand: true, diff --git a/package/deb/usr/bin/KeeWeb b/package/deb/usr/bin/KeeWeb deleted file mode 100755 index 411cf6d2..00000000 --- a/package/deb/usr/bin/KeeWeb +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -/usr/share/keeweb-desktop/KeeWeb "$@" diff --git a/package/deb/usr/bin/keeweb b/package/deb/usr/bin/keeweb new file mode 100755 index 00000000..3e692e4c --- /dev/null +++ b/package/deb/usr/bin/keeweb @@ -0,0 +1,2 @@ +#!/bin/bash +/usr/share/keeweb-desktop/keeweb "$@" diff --git a/package/deb/usr/share/appdata/keeweb.appdata.xml b/package/deb/usr/share/appdata/keeweb.appdata.xml index c48d1689..1b19959f 100644 --- a/package/deb/usr/share/appdata/keeweb.appdata.xml +++ b/package/deb/usr/share/appdata/keeweb.appdata.xml @@ -25,6 +25,6 @@ ​ https://keeweb.info ​ ​ -​ KeeWeb +​ keeweb ​ diff --git a/package/deb/usr/share/applications/keeweb.desktop b/package/deb/usr/share/applications/keeweb.desktop index cbfd9097..042fd8da 100644 --- a/package/deb/usr/share/applications/keeweb.desktop +++ b/package/deb/usr/share/applications/keeweb.desktop @@ -6,7 +6,7 @@ GenericName[es]=Gestor de contraseñas GenericName[fr]=Gestionnaire de mot de passe GenericName[ru]=Менеджер паролей Comment=Free cross-platform password manager compatible with KeePass -Exec=KeeWeb %u +Exec=keeweb %u Icon=keeweb Terminal=false StartupNotify=false