From 4e6f0c2843255ba857a6c07771c3ddaab01e43b3 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Sun, 21 Aug 2022 14:47:18 -0500 Subject: [PATCH 01/14] Maybe --- snap/snapcraft.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 860b103..2cfbdc2 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -4,7 +4,6 @@ summary: Resource monitor that shows usage and stats description: | Resource monitor that shows usage and stats for processor, memory, disks, network and processes. C++ version and continuation of bashtop and bpytop. - license: Apache-2.0 base: core20 @@ -14,10 +13,7 @@ compression: lzo architectures: - build-on: amd64 - - build-on: arm64 - - build-on: armhf - - build-on: ppc64el - - build-on: s390x + run-on: [all] package-repositories: - type: apt @@ -26,6 +22,8 @@ package-repositories: apps: btop: command: usr/local/bin/btop + extensions: + - gnome-3-38 environment: LC_ALL: C.UTF-8 LANG: C.UTF-8 From 40bb998edfa513fbf3e3be9ae795013654dcd7d9 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Sun, 21 Aug 2022 14:56:21 -0500 Subject: [PATCH 02/14] Update snapcraft.yaml --- snap/snapcraft.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 2cfbdc2..c77e06a 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -13,7 +13,10 @@ compression: lzo architectures: - build-on: amd64 - run-on: [all] + - build-on: arm64 + - build-on: armhf + - build-on: ppc64el + - build-on: s390x package-repositories: - type: apt @@ -21,7 +24,8 @@ package-repositories: apps: btop: - command: usr/local/bin/btop + command: desktop-launch usr/local/bin/btop + desktop: usr/local/bin/btop.desktop extensions: - gnome-3-38 environment: From e199fdd4b20d3a2830e9df1994d7aa867754b4c4 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Sun, 21 Aug 2022 14:58:13 -0500 Subject: [PATCH 03/14] Update snapcraft.yaml --- snap/snapcraft.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index c77e06a..f21863f 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -40,6 +40,11 @@ apps: - network-observe - home - removable-media + - desktop + - desktop-legacy + - x11 + - wayland + - unity7 parts: btop: From aabfc82c44f99ec3a2efe4a34418c0979cbde042 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Sun, 21 Aug 2022 15:02:48 -0500 Subject: [PATCH 04/14] Update snapcraft.yaml --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index f21863f..2fa4331 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -24,7 +24,7 @@ package-repositories: apps: btop: - command: desktop-launch usr/local/bin/btop + command: usr/local/bin/btop desktop: usr/local/bin/btop.desktop extensions: - gnome-3-38 From 4535e04fc51ca7dfc605135cbf87f5825973a714 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Sun, 21 Aug 2022 15:06:55 -0500 Subject: [PATCH 05/14] Update snapcraft.yaml --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 2fa4331..79e8849 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -25,7 +25,7 @@ package-repositories: apps: btop: command: usr/local/bin/btop - desktop: usr/local/bin/btop.desktop + desktop: btop.desktop extensions: - gnome-3-38 environment: From 4c029eed07068a7325596052416fc551cb6897e2 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Sun, 21 Aug 2022 15:13:45 -0500 Subject: [PATCH 06/14] Update snapcraft.yaml --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 79e8849..2760171 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -25,7 +25,7 @@ package-repositories: apps: btop: command: usr/local/bin/btop - desktop: btop.desktop + desktop: usr/local/bin/share/applications/btop.desktop extensions: - gnome-3-38 environment: From b80ef50131822367460d327f207e3da8d1cf15a4 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Sun, 21 Aug 2022 15:19:58 -0500 Subject: [PATCH 07/14] Update snapcraft.yaml --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 2760171..4b6d767 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -25,7 +25,7 @@ package-repositories: apps: btop: command: usr/local/bin/btop - desktop: usr/local/bin/share/applications/btop.desktop + desktop: usr/local/share/applications/btop.desktop extensions: - gnome-3-38 environment: From e700334c354806ef8b12aef5a8e54f9324dedf54 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Sun, 21 Aug 2022 15:29:22 -0500 Subject: [PATCH 08/14] Create btop.desktop --- snap/gui/btop.desktop | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 snap/gui/btop.desktop diff --git a/snap/gui/btop.desktop b/snap/gui/btop.desktop new file mode 100644 index 0000000..c613d67 --- /dev/null +++ b/snap/gui/btop.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=btop++ +GenericName=System Monitor +GenericName[it]=Monitor di sistema +Comment=Resource monitor that shows usage and stats for processor, memory, disks, network and processes +Comment[it]=Monitoraggio delle risorse: mostra utilizzo e statistiche per CPU, dischi, rete e processi +Icon=${SNAP}/meta/gui/btop.svg +Exec=btop +Terminal=true +Categories=System;Monitor;ConsoleOnly; +Keywords=system;process;task From aa9b750bc556149bff0b30fe13ff688214b7baac Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Sun, 21 Aug 2022 15:31:02 -0500 Subject: [PATCH 09/14] Add files via upload --- snap/gui/icon.svg | 111 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 snap/gui/icon.svg diff --git a/snap/gui/icon.svg b/snap/gui/icon.svg new file mode 100644 index 0000000..402b842 --- /dev/null +++ b/snap/gui/icon.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + From 00417c28d961f29b997c19b29a6c6704e1aa16fa Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Sun, 21 Aug 2022 15:31:20 -0500 Subject: [PATCH 10/14] Update btop.desktop --- snap/gui/btop.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/gui/btop.desktop b/snap/gui/btop.desktop index c613d67..410d198 100644 --- a/snap/gui/btop.desktop +++ b/snap/gui/btop.desktop @@ -6,7 +6,7 @@ GenericName=System Monitor GenericName[it]=Monitor di sistema Comment=Resource monitor that shows usage and stats for processor, memory, disks, network and processes Comment[it]=Monitoraggio delle risorse: mostra utilizzo e statistiche per CPU, dischi, rete e processi -Icon=${SNAP}/meta/gui/btop.svg +Icon=${SNAP}/meta/gui/icon.svg Exec=btop Terminal=true Categories=System;Monitor;ConsoleOnly; From 3b3b44e20b956f049acd5b32e40358cadd2cf6ee Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Sun, 21 Aug 2022 15:32:12 -0500 Subject: [PATCH 11/14] Update btop.desktop --- snap/gui/btop.desktop | 2 -- 1 file changed, 2 deletions(-) diff --git a/snap/gui/btop.desktop b/snap/gui/btop.desktop index 410d198..0135a93 100644 --- a/snap/gui/btop.desktop +++ b/snap/gui/btop.desktop @@ -3,9 +3,7 @@ Type=Application Version=1.0 Name=btop++ GenericName=System Monitor -GenericName[it]=Monitor di sistema Comment=Resource monitor that shows usage and stats for processor, memory, disks, network and processes -Comment[it]=Monitoraggio delle risorse: mostra utilizzo e statistiche per CPU, dischi, rete e processi Icon=${SNAP}/meta/gui/icon.svg Exec=btop Terminal=true From 46de9a595d116b02cd4d38505c32ab8ae8067a20 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Sun, 21 Aug 2022 15:41:27 -0500 Subject: [PATCH 12/14] Update snapcraft.yaml --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 4b6d767..79e8849 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -25,7 +25,7 @@ package-repositories: apps: btop: command: usr/local/bin/btop - desktop: usr/local/share/applications/btop.desktop + desktop: btop.desktop extensions: - gnome-3-38 environment: From 238f23a0cfdeb9c48d62bdfb1f0482db4ff8fae7 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Sun, 21 Aug 2022 15:45:24 -0500 Subject: [PATCH 13/14] Update snapcraft.yaml --- snap/snapcraft.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 79e8849..e000e9a 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -25,7 +25,6 @@ package-repositories: apps: btop: command: usr/local/bin/btop - desktop: btop.desktop extensions: - gnome-3-38 environment: From ad03a3723a31912e8e8836aba02ce13bdee57d66 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Sun, 21 Aug 2022 16:09:51 -0500 Subject: [PATCH 14/14] Update snapcraft.yaml --- snap/snapcraft.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index e000e9a..b91baf4 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -15,8 +15,6 @@ architectures: - build-on: amd64 - build-on: arm64 - build-on: armhf - - build-on: ppc64el - - build-on: s390x package-repositories: - type: apt