diff --git a/.gitignore b/.gitignore index 5aca7a3..315cc91 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,4 @@ !.gitignore !.SRCINFO !PKGBUILD -!calamares-install.hook -!calamares-install.install \ No newline at end of file + diff --git a/PKGBUILD b/PKGBUILD index 931df0f..47d66a7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,30 +1,21 @@ -# Maintainer: davedatum +# Maintainer: davedatum pkgname=tromjaro-calamares-theme pkgver=3.2.18 -pkgrel=1 +pkgrel=1.1 pkgdesc="Theme for calamares" arch=("any") url="https://gitlab.com/tromsite/tromjaro/calamares-settings" license=("GPL3") depends=("calamares") makedepends=("git") -source=("${pkgname}::git+${url}.git#commit=8b995f95af722de674fcdbe286fbc1f438c3e82b" - "calamares-install.hook" - "calamares-install.install") -sha256sums=('SKIP' - 'c45e567fe629bf1b2c670d08ccc44374f0ae3646dda00da4dcc0077aa7f2f6e8' - '792f8773a590515dcffa08f1c2eb906efd99aac630bbd3f5b70a358f3a7f8e7c') +source=("${pkgname}::git+${url}.git#commit=a1b0dcbcf953f4b46809a8773d6e3cdd9c04d47d") +sha256sums=('SKIP') package() { install -d "${pkgdir}/etc" cp -r "${srcdir}/${pkgname}/calamares" "${pkgdir}/etc/" - install -Dm644 "${srcdir}/calamares-install.hook" "${pkgdir}/usr/share/libalpm/hooks/calamares-install.hook" - - install -Dm644 "${srcdir}/${pkgname}/systemd/calamares-launch.service" "${pkgdir}/etc/systemd/system/calamares-launch.service" - install -Dm644 "${srcdir}/${pkgname}/systemd/calamares-launch.timer" "${pkgdir}/etc/systemd/system/calamares-launch.timer" - - install -Dm644 "${srcdir}/${pkgbase}/calamares-launch-script.sh" \ - "${pkgdir}/usr/bin/calamares-launch-script" + install -Dm755 "${srcdir}/${pkgname}/calamares.desktop" \ + "${pkgdir}/etc/skel/.config/autostart/calamares.desktop" } diff --git a/calamares-install.hook b/calamares-install.hook deleted file mode 100644 index c9b8ad3..0000000 --- a/calamares-install.hook +++ /dev/null @@ -1,10 +0,0 @@ -[Trigger] -Operation = Install -Operation = Upgrade -Type = Package -Target = tromjaro-calamares-theme - -[Action] -Description = enable systemd timer + service for calamares_polkit -When = PostTransation -Exec = /bin/bash -c '/usr/bin/calamares-launch-script' \ No newline at end of file diff --git a/calamares-install.install b/calamares-install.install deleted file mode 100644 index 554ae89..0000000 --- a/calamares-install.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - chmod +x /usr/bin/calamares-launch-script -} - -post_upgrade() { - post_install -} \ No newline at end of file