From b9f130610f06134ff7bd11c36fa99b9de2b0e720 Mon Sep 17 00:00:00 2001 From: Rudra Saraswat Date: Sun, 25 Jun 2023 16:45:19 +1000 Subject: [PATCH 01/10] feat: add blend-package-installer.desktop --- PKGBUILD | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/PKGBUILD b/PKGBUILD index 1fe6fef..f21d87c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,10 +11,12 @@ license=('GPL3') makedepends=("electron" 'git' 'npm' 'base-devel') source=('git+file://[BASE_ASSEMBLE_PATH]/projects/blend' 'blend-settings.desktop' + 'blend-package-installer.desktop' 'blend-settings' 'blend.sh') sha256sums=('SKIP' 'a605d24d2fa7384b45a94105143db216db1ffc0bdfc7f6eec758ef2026e61e54' + '23decd858ab49e860999bba783da78f43adc7b678065057cadfc2eeaefb2e870' '73cb7c39190d36f233b8dfbc3e3e6737d56e61e90881ad95f09e5ae1f9b405a8' 'SKIP') pkgver() { @@ -96,5 +98,8 @@ package_blend-settings-git() { install -Dm644 "${srcdir}/${pkgname%-git}.desktop" -t \ "${pkgdir}"/usr/share/applications/ + install -Dm644 "${srcdir}/blend-package-installer.desktop" -t \ + "${pkgdir}"/usr/share/applications/ + install -Dm755 "${srcdir}/${pkgname%-git}" -t "${pkgdir}"/usr/bin/ } From d36c1db8c69e1fb75a17f0c76d38b8bc5ea3942a Mon Sep 17 00:00:00 2001 From: Rudra Saraswat Date: Sun, 25 Jun 2023 21:28:14 +1000 Subject: [PATCH 02/10] chore: remove blend-package-installer.desktop from .gitignore --- .gitignore | 1 + blend-package-installer.desktop | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 blend-package-installer.desktop diff --git a/.gitignore b/.gitignore index c565390..602e85a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ !blend.sh !blend-settings !blend-settings.desktop +!blend-package-installer.desktop !.SRCINFO diff --git a/blend-package-installer.desktop b/blend-package-installer.desktop new file mode 100644 index 0000000..be2702d --- /dev/null +++ b/blend-package-installer.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Package Installer +Exec=blend-settings package %F +Terminal=false +NoDisplay=true +Type=Application +Icon=blend-settings +StartupWMClass=blend-settings +Comment=Package installer for blendOS. +Categories=System; From 8d8ed1cd8749fcee6b33a9a58f85c566b8b885fa Mon Sep 17 00:00:00 2001 From: Rudra Saraswat Date: Thu, 16 Nov 2023 08:08:18 +0000 Subject: [PATCH 03/10] chore: update source --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index f21d87c..4b5c3a2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ arch=('x86_64' 'i686') url="https://github.com/blend-os/blend" license=('GPL3') makedepends=("electron" 'git' 'npm' 'base-devel') -source=('git+file://[BASE_ASSEMBLE_PATH]/projects/blend' +source=('git+https://github.com/blend-os/blend' 'blend-settings.desktop' 'blend-package-installer.desktop' 'blend-settings' From 3d98a0f04bc02343f1f52c0d8f6e4889923e729c Mon Sep 17 00:00:00 2001 From: Rudra Saraswat Date: Fri, 9 Feb 2024 21:16:26 +0530 Subject: [PATCH 04/10] chore: rename to 'System' --- blend-settings.desktop | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/blend-settings.desktop b/blend-settings.desktop index 8137fd9..4f5cad6 100644 --- a/blend-settings.desktop +++ b/blend-settings.desktop @@ -1,9 +1,10 @@ [Desktop Entry] -Name=blendOS Settings +Name=System Exec=blend-settings %U Terminal=false Type=Application Icon=blend-settings StartupWMClass=blend-settings Comment=Settings for blendOS. +Keywords=Settings; Categories=System; From db553e0199c53ede1c05ded01b273b51d8912abd Mon Sep 17 00:00:00 2001 From: Rudra Saraswat Date: Fri, 9 Feb 2024 21:47:55 +0530 Subject: [PATCH 05/10] chore: update checksums --- PKGBUILD | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 4b5c3a2..475734e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,9 +15,11 @@ source=('git+https://github.com/blend-os/blend' 'blend-settings' 'blend.sh') sha256sums=('SKIP' + 'ba11ef22fe92a78239855c1bbc07d8c5be7cd94728bb3baf6184d2f42a80a4c2' 'a605d24d2fa7384b45a94105143db216db1ffc0bdfc7f6eec758ef2026e61e54' '23decd858ab49e860999bba783da78f43adc7b678065057cadfc2eeaefb2e870' - '73cb7c39190d36f233b8dfbc3e3e6737d56e61e90881ad95f09e5ae1f9b405a8' 'SKIP') + '73cb7c39190d36f233b8dfbc3e3e6737d56e61e90881ad95f09e5ae1f9b405a8' + '7dab67fb5c0239b6645659a7838de85b1420683a5bf52d8a8a3d324b69210a40') pkgver() { cd "${srcdir}/${pkgbase%-git}" From 346e5e5b8bcf1c142b197395639230b203423f26 Mon Sep 17 00:00:00 2001 From: Rudra Saraswat Date: Fri, 9 Feb 2024 21:51:32 +0530 Subject: [PATCH 06/10] chore: update checksums --- PKGBUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 475734e..7756307 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -16,7 +16,6 @@ source=('git+https://github.com/blend-os/blend' 'blend.sh') sha256sums=('SKIP' 'ba11ef22fe92a78239855c1bbc07d8c5be7cd94728bb3baf6184d2f42a80a4c2' - 'a605d24d2fa7384b45a94105143db216db1ffc0bdfc7f6eec758ef2026e61e54' '23decd858ab49e860999bba783da78f43adc7b678065057cadfc2eeaefb2e870' '73cb7c39190d36f233b8dfbc3e3e6737d56e61e90881ad95f09e5ae1f9b405a8' '7dab67fb5c0239b6645659a7838de85b1420683a5bf52d8a8a3d324b69210a40') From 3194fc8124502552dc2ee6870aceb593c8b0b031 Mon Sep 17 00:00:00 2001 From: Rudra Saraswat Date: Fri, 9 Feb 2024 23:17:53 +0530 Subject: [PATCH 07/10] chore: add mimetype to blend-package-installer.desktop --- PKGBUILD | 2 +- blend-package-installer.desktop | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 7756307..b83ed43 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -16,7 +16,7 @@ source=('git+https://github.com/blend-os/blend' 'blend.sh') sha256sums=('SKIP' 'ba11ef22fe92a78239855c1bbc07d8c5be7cd94728bb3baf6184d2f42a80a4c2' - '23decd858ab49e860999bba783da78f43adc7b678065057cadfc2eeaefb2e870' + '994bebb5e993130e5cfaac8f9e1e8e676662a0cc76abcf90c8e128576506b818' '73cb7c39190d36f233b8dfbc3e3e6737d56e61e90881ad95f09e5ae1f9b405a8' '7dab67fb5c0239b6645659a7838de85b1420683a5bf52d8a8a3d324b69210a40') diff --git a/blend-package-installer.desktop b/blend-package-installer.desktop index be2702d..e5c33b9 100644 --- a/blend-package-installer.desktop +++ b/blend-package-installer.desktop @@ -5,6 +5,7 @@ Terminal=false NoDisplay=true Type=Application Icon=blend-settings +MimeType=application/vnd.debian.binary-package;application/x-rpm;application/vnd.android.package-archive; StartupWMClass=blend-settings Comment=Package installer for blendOS. Categories=System; From 25034878c3b6979742995b5ae72efc7717699e56 Mon Sep 17 00:00:00 2001 From: Rudra Saraswat Date: Mon, 3 Jun 2024 17:28:15 +0000 Subject: [PATCH 08/10] feat: include user utility --- PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/PKGBUILD b/PKGBUILD index b83ed43..fdfc71e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -51,6 +51,7 @@ package_blend-git() { cd "${srcdir}/${pkgbase%-git}" install -Dm755 \ "${pkgname%-git}" \ + "user" \ "init-${pkgname%-git}" \ "host-${pkgname%-git}" \ "${pkgname%-git}-files" \ From 96a25b7c17be4e72293937bb71f803ff92456f04 Mon Sep 17 00:00:00 2001 From: Rudra Saraswat Date: Mon, 3 Jun 2024 20:16:59 +0000 Subject: [PATCH 09/10] feat: add python-click as dep --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index fdfc71e..bbb88db 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -44,7 +44,7 @@ build() { } package_blend-git() { - depends=('bash' 'blend-settings-git' 'podman' 'python' 'python-pexpect') + depends=('bash' 'blend-settings-git' 'podman' 'python' 'python-click' 'python-pexpect') provides=("${pkgname%-git}") conflicts=("${pkgname%-git}") From 64e9902f6e471600ffdcbbb6fcd3198a5237272b Mon Sep 17 00:00:00 2001 From: askiiart Date: Tue, 1 Oct 2024 22:37:25 -0500 Subject: [PATCH 10/10] edit for my version --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index bbb88db..a79c7d1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,10 +6,10 @@ pkgver=r50.2e0016f pkgrel=1 pkgdesc="A package manager for blendOS" arch=('x86_64' 'i686') -url="https://github.com/blend-os/blend" +url="https://git.askiiart.net/askiiart-blendos/blend" license=('GPL3') makedepends=("electron" 'git' 'npm' 'base-devel') -source=('git+https://github.com/blend-os/blend' +source=('git+https://git.askiiart.net/askiiart-blendos/blend' 'blend-settings.desktop' 'blend-package-installer.desktop' 'blend-settings'