increment to version 0.2.0 plus compatibility changes for install script

3 files changed, 16 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5e0e2bc15661..e1c87e6a2c29 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = upgrade
 	pkgdesc = Simplify system upgrades
-	pkgver = 0.1.2
+	pkgver = 0.2.0
 	pkgrel = 0
 	url = https://github.com/dnut/upgrade
 	install = upgrade.install
@@ -15,7 +15,7 @@ pkgbase = upgrade
 	depends = paru
 	depends = kernel-modules-hook
 	backup = etc/upgrade.conf
-	source = git+https://github.com/dnut/upgrade#tag=0.1.2
+	source = git+https://github.com/dnut/upgrade#tag=0.2.0
 	sha256sums = SKIP
 
 pkgname = upgrade
diff --git a/PKGBUILD b/PKGBUILD
index 2bd751b29bde..95bd250a638f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Drew Nutter <dnut@users.noreply.github.com>
 pkgname=upgrade
-pkgver=0.1.2
+pkgver=0.2.0
 pkgrel=0
 pkgdesc='Simplify system upgrades'
 url='https://github.com/dnut/upgrade'
@@ -28,5 +28,6 @@ package() {
     install -Dm644 upgrade.service "${pkgdir}/etc/systemd/system/upgrade.service"
     install -Dm644 upgrade.timer "${pkgdir}/etc/systemd/system/upgrade.timer"
     
+    install -Dm644 upgrade.sudoers "${pkgdir}/etc/sudoers.d/upgrade"
     install -Dm644 upgrade.conf "${pkgdir}/etc/upgrade.conf"
 }
diff --git a/upgrade.install b/upgrade.install
index 59878868af80..82ec5712cea3 100644
--- a/upgrade.install
+++ b/upgrade.install
@@ -1,14 +1,22 @@
+rm_sudo() {
+    # this is kept around to let all the dependent systems get up to date
+    # these lines are removed from /etc/sudoers on 2022-10-11 in favor of sudoers.d/upgrade
+    sed -i '/^upgrade /d' /etc/sudoers
+    sed -i '/^%upgraders /d' /etc/sudoers
+}
 
 post_install() {
     groupadd upgraders
     useradd -mG upgraders upgrade
-    echo 'upgrade ALL=(ALL) NOPASSWD: /usr/bin/pacman' >> /etc/sudoers
-    echo '%upgraders ALL=(ALL) /usr/bin/upgrade' >> /etc/sudoers
     systemctl enable --now upgrade.timer
 }
 
 post_remove() {
     userdel upgrade
-    sed -i '/^upgrade /d' /etc/sudoers
-    sed -i '/^%upgraders /d' /etc/sudoers
+    groupdel upgraders
+    rm_sudo
+}
+
+post_upgrade() {
+    rm_sudo
 }