From ae40f78d23396f63cdb0e59b1439a23a621077e1 Mon Sep 17 00:00:00 2001
From: root <holta@users.noreply.github.com>
Date: Thu, 12 Dec 2024 22:54:44 +0100
Subject: [PATCH] Put iiab-netwarn & iiab-pwdwarn-labwc in
 ~/.config/labwc/autostart

---
 roles/iiab-admin/tasks/pwd-warnings.yml       | 27 +++++++++----------
 ...dwarn-wayfire.j2 => iiab-pwdwarn-labwc.j2} |  0
 roles/network/tasks/netwarn.yml               | 21 +++++++--------
 roles/network/templates/netwarn/iiab-netwarn  |  5 +++-
 4 files changed, 27 insertions(+), 26 deletions(-)
 rename roles/iiab-admin/templates/{iiab-pwdwarn-wayfire.j2 => iiab-pwdwarn-labwc.j2} (100%)

diff --git a/roles/iiab-admin/tasks/pwd-warnings.yml b/roles/iiab-admin/tasks/pwd-warnings.yml
index 46d091bec..200ff30ab 100644
--- a/roles/iiab-admin/tasks/pwd-warnings.yml
+++ b/roles/iiab-admin/tasks/pwd-warnings.yml
@@ -8,17 +8,17 @@
     dest: /etc/profile.d/iiab-pwdwarn-profile.sh
     mode: '0644'
 
-- name: Does /home/{{ iiab_admin_user }}/.config/wayfire.ini exist?
+- name: Does directory /home/{{ iiab_admin_user }}/.config/labwc/ exist?
   stat:
-    path: /home/{{ iiab_admin_user }}/.config/wayfire.ini
-  register: wayfire_ini
+    path: /home/{{ iiab_admin_user }}/.config/labwc/
+  register: labwc_dir
 
-- name: "If so, install from template: /usr/local/sbin/iiab-pwdwarn-wayfire"
+- name: "If so, install from template: /usr/local/sbin/iiab-pwdwarn-labwc"
   template:
-    src: iiab-pwdwarn-wayfire.j2
-    dest: /usr/local/sbin/iiab-pwdwarn-wayfire
+    src: iiab-pwdwarn-labwc.j2
+    dest: /usr/local/sbin/iiab-pwdwarn-labwc
     mode: '0755'
-  when: wayfire_ini.stat.exists
+  when: labwc_dir.stat.exists and labwc_dir.stat.isdir
 
 # 2019-03-07: This pop-up (/etc/xdg/lxsession/LXDE-pi/sshpwd-lxde-iiab.sh) did
 # not actually appear when triggered by /etc/xdg/autostart/pprompt-iiab.desktop
@@ -28,10 +28,9 @@
 # https://specifications.freedesktop.org/autostart-spec/autostart-spec-latest.html
 # Raspbian's 2016-2018 evolution here: https://github.com/iiab/iiab/issues/1537
 
-- name: ...and put a line in /home/{{ iiab_admin_user }}/.config/wayfire.ini to trigger iiab-pwdwarn-wayfire (& pop-up as nec)
-  ini_file:
-    path: /home/{{ iiab_admin_user }}/.config/wayfire.ini    # iiab-admin
-    section: autostart
-    option: iiab-pwdwarn-wayfire
-    value: /usr/local/sbin/iiab-pwdwarn-wayfire
-  when: wayfire_ini.stat.exists
+- name: ...and put a line in /home/{{ iiab_admin_user }}/.config/labwc/autostart to trigger iiab-pwdwarn-labwc (& pop-up as nec)
+  lineinfile:
+    path: /home/{{ iiab_admin_user }}/.config/labwc/autostart    # iiab-admin
+    create: yes
+    line: /usr/local/sbin/iiab-pwdwarn-labwc
+  when: labwc_dir.stat.exists and labwc_dir.stat.isdir
diff --git a/roles/iiab-admin/templates/iiab-pwdwarn-wayfire.j2 b/roles/iiab-admin/templates/iiab-pwdwarn-labwc.j2
similarity index 100%
rename from roles/iiab-admin/templates/iiab-pwdwarn-wayfire.j2
rename to roles/iiab-admin/templates/iiab-pwdwarn-labwc.j2
diff --git a/roles/network/tasks/netwarn.yml b/roles/network/tasks/netwarn.yml
index 2ce6aaac0..67b717358 100644
--- a/roles/network/tasks/netwarn.yml
+++ b/roles/network/tasks/netwarn.yml
@@ -5,18 +5,17 @@
 # shell / ssh logins (across all OS's/distros/window managers) might also make sense?
 
 
-- name: Does /home/{{ iiab_admin_user }}/.config/wayfire.ini exist?
+- name: Does directory /home/{{ iiab_admin_user }}/.config/labwc/ exist?
   stat:
-    path: /home/{{ iiab_admin_user }}/.config/wayfire.ini
-  register: wayfire_ini
+    path: /home/{{ iiab_admin_user }}/.config/labwc/
+  register: labwc_dir
 
-- name: If so, add /usr/local/sbin/iiab-netwarn to /home/{{ iiab_admin_user }}/.config/wayfire.ini
-  ini_file:
-    path: /home/{{ iiab_admin_user }}/.config/wayfire.ini    # iiab-admin
-    section: autostart
-    option: iiab-netwarn
-    value: /usr/local/sbin/iiab-netwarn
-  when: wayfire_ini.stat.exists
+- name: If so, add /usr/local/sbin/iiab-netwarn to /home/{{ iiab_admin_user }}/.config/labwc/autostart
+  lineinfile:
+    path: /home/{{ iiab_admin_user }}/.config/labwc/autostart    # iiab-admin
+    create: yes
+    line: /usr/local/sbin/iiab-netwarn
+  when: labwc_dir.stat.exists and labwc_dir.stat.isdir
 
 
 # mate desktop detection based on 'register: nd_dir' in enable_services
@@ -45,4 +44,4 @@
     src: roles/network/templates/netwarn/iiab-netwarn    # Invoked by 1-prep (so full path needed)
     dest: /usr/local/sbin/
     mode: 0755
-  when: wayfire_ini.stat.exists or (mate_dir.stat.exists and mate_dir.stat.isdir)
+  when: (labwc_dir.stat.exists and labwc_dir.stat.isdir) or (mate_dir.stat.exists and mate_dir.stat.isdir)
diff --git a/roles/network/templates/netwarn/iiab-netwarn b/roles/network/templates/netwarn/iiab-netwarn
index b20d18fc6..87865e0f1 100755
--- a/roles/network/templates/netwarn/iiab-netwarn
+++ b/roles/network/templates/netwarn/iiab-netwarn
@@ -3,7 +3,10 @@
 # CONFUSING BUT FYI: Steps below run *strictly sequentially* when this script
 # (/usr/local/sbin/iiab-netwarn) is run on boot, triggered by either autostart:
 # https://specifications.freedesktop.org/autostart-spec/autostart-spec-latest.html
-# ...or by Wayland compositor Wayfire's ~/.config/wayfire.ini for RasPiOS 12+:
+# ...or by Wayland compositor's ~/.config/labwc/autostart in new RasPiOS 12+:
+# https://forums.raspberrypi.com/viewtopic.php?t=379321
+# (Prior to Dec 2024, RasPiOS compositor Wayfire did the same...)
+# https://github.com/iiab/iiab/pull/3685
 # https://github.com/WayfireWM/wayfire/wiki/Configuration#autostart
 #
 # This allows return codes ($rc) to be meaningful, at each successive step.