.cleanup

intune-portal/PKGBUILD

@@ -7,7 +7,7 @@ pkgdesc="Microsoft Intune helps organizations manage access to corporate apps, d
 url="https://packages.microsoft.com/ubuntu/20.04/prod/pool/main/i/intune-portal"
 license=("GPL2")
 arch=("x86_64")
-# Depends: libsoup2.4-1 (>= 2.4.0), libgtk-3-0 (>= 3.21.4), msalsdk-dbusclient (>= 1.0), libssl1.1 (>= 1.1.0), libcurl4 (>= 7.16.2), libc6 (>= 2.29), libsystemd0, libdbus-1-3 (>= 1.9.14), zlib1g (>= 1:1.2.0), libatk1.0-0 (>= 1.12.4), libuuid1 (>= 2.16), libglib2.0-0 (>= 2.35.8), libpam-pwquality (>= 1.4.0-2), gnome-keyring (>= 3.36), libgtk-3-0 (>= 3.9.10), libx11-6, libjavascriptcoregtk-4.0-18, libpango-1.0-0 (>= 1.14.0), libc6 (>= 2.28), libwebkit2gtk-4.0-37 (>= 2.5.3), libsecret-1-0 (>= 0.7), libglib2.0-0 (>= 2.12.0), libpam0g (>= 0.99.7.1), libstdc++6 (>= 9), libsqlite3-0 (>= 3.7.14)
+# Official Depends: libsoup2.4-1 (>= 2.4.0), libgtk-3-0 (>= 3.21.4), msalsdk-dbusclient (>= 1.0), libssl1.1 (>= 1.1.0), libcurl4 (>= 7.16.2), libc6 (>= 2.29), libsystemd0, libdbus-1-3 (>= 1.9.14), zlib1g (>= 1:1.2.0), libatk1.0-0 (>= 1.12.4), libuuid1 (>= 2.16), libglib2.0-0 (>= 2.35.8), libpam-pwquality (>= 1.4.0-2), gnome-keyring (>= 3.36), libgtk-3-0 (>= 3.9.10), libx11-6, libjavascriptcoregtk-4.0-18, libpango-1.0-0 (>= 1.14.0), libc6 (>= 2.28), libwebkit2gtk-4.0-37 (>= 2.5.3), libsecret-1-0 (>= 0.7), libglib2.0-0 (>= 2.12.0), libpam0g (>= 0.99.7.1), libstdc++6 (>= 9), libsqlite3-0 (>= 3.7.14)
 depends=("msalsdk-dbusclient" "gnome-keyring" "libsecret" "openssl-1.1" "webkit2gtk" "libjxl>0.9.0")
 makedepends=()
 conflicts=()

intune-portal/x.install

-post_install() {
-        if [ -d /run/systemd/system ] ; then
-            systemd-tmpfiles --create intune.conf
-	fi
-
-#            deb-systemd-helper --user enable intune-agent.timer >/dev/null || true
-#            deb-systemd-helper --user enable intune-agent.service >/dev/null || true
-
-        systemctl --system daemon-reload
-        #systemctl --global daemon-reload || echo "Current systemd version does not support automated reload of user units, please run 'systemctl --user daemon-reload as your user or reboot the machine."
-
-#            deb-systemd-invoke --user start intune-agent.timer >/dev/null || true
-            #echo "Current systemd version does not support automated start of user instances, please run 'systemctl --user start intune-agent.timer' as your user or reboot the machine."
-
-            systemctl enable intune-daemon.socket --now
-
-#        if [ -d /run/systemd/system ]; then
-#            systemctl --system daemon-reload >/dev/null || true
-#            if [ -n "$2" ]; then
-#                _dh_action=restart
-#            else
-#                _dh_action=start
-#            fi
-#            deb-systemd-invoke $_dh_action 'intune-daemon.socket' 'intune-daemon.service' >/dev/null || true
-#        fi
-
-        # Restart polkit to get any new authorization actions we put down
-        systemctl restart polkit.service 2>/dev/null
-	echo "TODO: systemctl enable --now --user intune-agent.timer"
+post_upgrade() {
+    # Restart polkit to get any new authorization actions we put down
+    systemctl restart polkit.service 2>/dev/null
 }
 
-post_upgrade() {
-    post_install
+post_install() {
+    if [ -d /run/systemd/system ] ; then
+        systemd-tmpfiles --create intune.conf
+    fi
+
+    systemctl --system daemon-reload
+    systemctl enable intune-daemon.socket --now
+
+    post_upgrade
+
+    echo "Please run: systemctl enable --now --user intune-agent.timer" 1>&2
 }
 
 pre_remove()
 {
-    systemctl stop intune-daemon.socket --now
+    systemctl disable intune-daemon.socket --now
 }
 
 pre_upgrade() {
@@ -43,14 +26,6 @@ pre_upgrade() {
 }
 
 post_remove() {
-        #systemctl --global daemon-reload || echo "Current systemd version does not support automated reload of user units, please run 'systemctl --user daemon-reload as your user or reboot the machine."
-        systemctl --system daemon-reload
-
-#            deb-systemd-helper --user purge 'intune-agent.timer' 'intune-agent.service' >/dev/null || true
-#            deb-systemd-helper --user unmask 'intune-agent.timer' 'intune-agent.service' >/dev/null || true
-#
-#            deb-systemd-helper purge 'intune-daemon.socket' 'intune-daemon.service' >/dev/null || true
-#            deb-systemd-helper unmask 'intune-daemon.socket' 'intune-daemon.service' >/dev/null || true
-
+    systemctl --system daemon-reload
 }