diff --git a/.gitignore b/.gitignore index 602e85a..c565390 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,4 @@ !blend.sh !blend-settings !blend-settings.desktop -!blend-package-installer.desktop !.SRCINFO diff --git a/PKGBUILD b/PKGBUILD index a79c7d1..1fe6fef 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,19 +6,16 @@ pkgver=r50.2e0016f pkgrel=1 pkgdesc="A package manager for blendOS" arch=('x86_64' 'i686') -url="https://git.askiiart.net/askiiart-blendos/blend" +url="https://github.com/blend-os/blend" license=('GPL3') makedepends=("electron" 'git' 'npm' 'base-devel') -source=('git+https://git.askiiart.net/askiiart-blendos/blend' +source=('git+file://[BASE_ASSEMBLE_PATH]/projects/blend' 'blend-settings.desktop' - 'blend-package-installer.desktop' 'blend-settings' 'blend.sh') sha256sums=('SKIP' - 'ba11ef22fe92a78239855c1bbc07d8c5be7cd94728bb3baf6184d2f42a80a4c2' - '994bebb5e993130e5cfaac8f9e1e8e676662a0cc76abcf90c8e128576506b818' - '73cb7c39190d36f233b8dfbc3e3e6737d56e61e90881ad95f09e5ae1f9b405a8' - '7dab67fb5c0239b6645659a7838de85b1420683a5bf52d8a8a3d324b69210a40') + 'a605d24d2fa7384b45a94105143db216db1ffc0bdfc7f6eec758ef2026e61e54' + '73cb7c39190d36f233b8dfbc3e3e6737d56e61e90881ad95f09e5ae1f9b405a8' 'SKIP') pkgver() { cd "${srcdir}/${pkgbase%-git}" @@ -44,14 +41,13 @@ build() { } package_blend-git() { - depends=('bash' 'blend-settings-git' 'podman' 'python' 'python-click' 'python-pexpect') + depends=('bash' 'blend-settings-git' 'podman' 'python' 'python-pexpect') provides=("${pkgname%-git}") conflicts=("${pkgname%-git}") cd "${srcdir}/${pkgbase%-git}" install -Dm755 \ "${pkgname%-git}" \ - "user" \ "init-${pkgname%-git}" \ "host-${pkgname%-git}" \ "${pkgname%-git}-files" \ @@ -100,8 +96,5 @@ 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/ } diff --git a/blend-package-installer.desktop b/blend-package-installer.desktop deleted file mode 100644 index e5c33b9..0000000 --- a/blend-package-installer.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Package Installer -Exec=blend-settings package %F -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; diff --git a/blend-settings.desktop b/blend-settings.desktop index 4f5cad6..8137fd9 100644 --- a/blend-settings.desktop +++ b/blend-settings.desktop @@ -1,10 +1,9 @@ [Desktop Entry] -Name=System +Name=blendOS Settings Exec=blend-settings %U Terminal=false Type=Application Icon=blend-settings StartupWMClass=blend-settings Comment=Settings for blendOS. -Keywords=Settings; Categories=System;