summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Butler2018-01-29 23:30:52 +0000
committerAlex Butler2018-01-29 23:30:52 +0000
commitac665f1f86cc5a1581cf0f89c4d028831cdfcfd4 (patch)
treecd05d1106271a76ad2923060249db62ae4777bc1
parent7258764d1648925cde25f84bf8148ec6f73c1e9e (diff)
downloadaur-ac665f1f86cc5a1581cf0f89c4d028831cdfcfd4.tar.gz
Update install script
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD2
-rw-r--r--aurto.install14
3 files changed, 6 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0b482753af47..32f65ec2e0f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
pkgbase = aurto
+ pkgdesc = A simple aur tool for managing a local 'aurto' repository
pkgver = 0.1
pkgrel = 1
+ url = https://github.com/alexheretic/aurto
install = aurto.install
arch = any
license = MIT
@@ -8,7 +10,7 @@ pkgbase = aurto
depends = devtools
depends = systemd
source = https://github.com/alexheretic/aurto/archive/v0.1.tar.gz
- sha256sums = 91435ee92ae97e94011e27eb646c0ec7e0c3da486b4df7f173686fa9250f59eb
+ sha256sums = 7173bf8a4ebb7203bb26f727851f5a1d9b6f351a347b3e242680ae7f44e7a3f6
pkgname = aurto
diff --git a/PKGBUILD b/PKGBUILD
index 7476af080e4d..8c60f804b68d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ optdepends=()
makedepends=()
install="aurto.install"
source=("https://github.com/alexheretic/$pkgname/archive/v$pkgver.tar.gz")
-sha256sums=('91435ee92ae97e94011e27eb646c0ec7e0c3da486b4df7f173686fa9250f59eb')
+sha256sums=('7173bf8a4ebb7203bb26f727851f5a1d9b6f351a347b3e242680ae7f44e7a3f6')
build() {
cd "$pkgname-$pkgver"
diff --git a/aurto.install b/aurto.install
index de2b499a5f5f..5f113d10dd89 100644
--- a/aurto.install
+++ b/aurto.install
@@ -26,19 +26,10 @@ post_install() {
install -d /var/cache/pacman/aurto -o "$user"
sudo -u "$user" repo-add /var/cache/pacman/aurto/aurto.db.tar 2>/dev/null
- echo 'aurto: Creating /var/lib/aurto-builder chroot'
- rm -rf /var/lib/aurto-builder*
- mkarchroot /var/lib/aurto-builder base-devel pigz >/dev/null 2>&1
- arch-nspawn /var/lib/aurto-builder /bin/bash -c "
- sed -i 's/COMPRESSGZ=(gzip -c -f -n)/COMPRESSGZ=(pigz -c -f -n)/' /etc/makepkg.conf
- sed -i \"s/PKGEXT='.pkg.tar.xz'/PKGEXT='.pkg.tar.gz'/\" /etc/makepkg.conf
- "
-
echo 'aurto: Adding passwordless use of arch-nspawn, mkarchroot, makechrootpkg, aurbuild_chroot' >&2
cp /etc/sudoers /etc/sudoers.aurto-backup
echo "## aurto rules
%$user ALL=(ALL) NOPASSWD: /usr/bin/arch-nspawn
-%$user ALL=(ALL) NOPASSWD: /usr/bin/mkarchroot
%$user ALL=(ALL) NOPASSWD:SETENV: /usr/bin/makechrootpkg
%$user ALL=(ALL) NOPASSWD:SETENV: /usr/bin/aurbuild_chroot
## /aurto rules" >> /etc/sudoers
@@ -66,13 +57,12 @@ post_remove() {
echo 'aurto: Removing aurto rules from /etc/sudoers' >&2
sed -i '/^## aurto rules$/,/^## \/aurto rules$/d' /etc/sudoers
- echo 'aurto: Removing /var/lib/aurto-builder' >&2
- rm -rf /var/lib/aurto-builder* || true
-
echo 'aurto: Removing /var/cache/pacman/aurto' >&2
rm -rf /var/cache/pacman/aurto || true
echo 'aurto: Removing include from pacman.conf' >&2
sed -i '/^Include = \/etc\/pacman.d\/aurto$/d' /etc/pacman.conf
sed -i '/^# aurto repo$/d' /etc/pacman.conf
+
+ rm -rf /usr/lib/aurto/user || true
}