From 842c18ee93ed5c01114f9f51d06a992a70ecab3c Mon Sep 17 00:00:00 2001
From: Raphael Werner <raphael.werner@sidion.de>
Date: Sat, 3 May 2025 16:32:13 +0200
Subject: [PATCH] Created sub-task for default rpm uninstall

---
 .vscode/settings.json                         |  5 +++-
 roles/silverblue/tasks/main.yml               | 28 ++++---------------
 roles/silverblue/tasks/rpmostree_override.yml | 12 ++++++++
 3 files changed, 21 insertions(+), 24 deletions(-)
 create mode 100644 roles/silverblue/tasks/rpmostree_override.yml

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2120b8f..63d3cbd 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,6 @@
 {
-    "ansible.python.interpreterPath": "/bin/python"
+    "ansible.python.interpreterPath": "/usr/bin/python3",
+    "yaml.schemas": {
+        "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/ansible.json#/$defs/tasks": "file:///Users/insider.owner/Projekte/post_install/roles/silverblue/tasks/rpmostree_override.yml"
+    }
 }
diff --git a/roles/silverblue/tasks/main.yml b/roles/silverblue/tasks/main.yml
index 1245b68..cee2129 100644
--- a/roles/silverblue/tasks/main.yml
+++ b/roles/silverblue/tasks/main.yml
@@ -3,29 +3,11 @@
 
 - name: "Remove and install rpm-ostree software"
   block:
-    - name: "Check if Gnome Software rpm-ostree is installed"
-      ansible.builtin.stat:
-        path: /usr/lib64/gnome-software/plugins-22/libgs_plugin_rpm-ostree.so
-      register: gnomesoftwarerpmostree_check
-
-    - name: "Uninstall Gnome Software rpm-ostree if it is installed"
-      become: true
-      ansible.builtin.command: "rpm-ostree override remove gnome-software-rpm-ostree"
-      when: gnomesoftwarerpmostree_check.stat.exists
-      register: gnomesoftwarerpmostree_uninstall
-      changed_when: gnomesoftwarerpmostree_uninstall.rc != 0
-
-    - name: "Check if Gnome Software is installed"
-      ansible.builtin.stat:
-        path: /usr/sbin/gnome-software
-      register: gnomesoftware_check
-
-    - name: "Uninstall Gnome Software if it is installed"
-      become: true
-      ansible.builtin.command: "rpm-ostree override remove gnome-software"
-      when: gnomesoftware_check.stat.exists
-      register: gnomesoftware_uninstall
-      changed_when: gnomesoftware_uninstall.rc != 0
+    - name: "Uninstall Default rpm software"
+      ansible.builtin.include_tasks: rpmostree_override.yml
+      vars:
+        pkg_path: "/usr/lib64/gnome-software/plugins-22/libgs_plugin_rpm-ostree.so"
+        package: "gnome-software-rpm-ostree"
 
     - name: "Upgrade the rpm-ostree image"
       ansible.posix.rpm_ostree_upgrade:
diff --git a/roles/silverblue/tasks/rpmostree_override.yml b/roles/silverblue/tasks/rpmostree_override.yml
new file mode 100644
index 0000000..c94638a
--- /dev/null
+++ b/roles/silverblue/tasks/rpmostree_override.yml
@@ -0,0 +1,12 @@
+---
+- name: "Check if software is installed"
+  ansible.builtin.stat:
+    path: "{{ pkg_path }}"
+  register: path_check
+
+- name: "Uninstall software if it is installed"
+  become: true
+  ansible.builtin.command: "rpm-ostree override remove {{ package }}"
+  when: path_check.stat.exists
+  register: software_uninstall
+  changed_when: software_uninstall.rc != 0