feat: Remove rebase step now that ISOs are nearly ready, move topgrad…

…e configs to /usr/share, cleanup.

README.md

@@ -1,6 +1,6 @@
 # Universal Blue Update
 
-Small update program written in python intended for use in Universal Blue, executes update scripts/tasks placed in `/etc/ublue-update.d` (make sure each script has exec perms)
+Small update program written in python intended for use in Universal Blue, executes topgrade with custom configs for the system and individual users.
 
 Includes systemd timers and services for auto update
 
@@ -75,20 +75,15 @@ $ journalctl -exu 'ublue-update.service'
 # Configuration
 
 ## Update Scripts
-Update scripts are separated into two directories inside of `/etc/ublue-update.d`
+Update scripts are separated into two files inside of `/usr/share/ublue-update`
 
-### `/etc/ublue-update.d/user`
+### `/usr/share/ublue-update/topgrade-system.toml`
 
-Update scripts are ran as user. Scripts included:
-  - per-user flatpak update scripts (uninstalling unused deps and repairing flatpak install for maintenence)
-  - distrobox update script
-  - fleek update script
+Topgrade config ran as root.
 
-### `/etc/ublue-update.d/system`
+### `/usr/share/ublue-update/topgrade-user.toml`
 
-Update scripts are ran as root, these updates are meant to be system-wide. Scripts included:
-  - OS update script (depends on [`rpm-ostree`](https://github.com/coreos/rpm-ostree))
-  - system-wide flatpak update scripts (uninstalling unused deps and repairing flatpak install for maintenence)
+Topgrade config ran as user.
 
 
 ## Location

src/ublue_update/cli.py

@@ -86,30 +86,6 @@ def hardware_inhibitor_checks_failed(
     raise Exception(f"update failed to pass checks: \n - {exception_log}")
 
 
-def run_update_scripts(root_dir: str):
-    for root, dirs, files in os.walk(root_dir):
-        for file in files:
-            full_path = root_dir + str(file)
-            executable = os.access(full_path, os.X_OK)
-            if executable:
-                log.info(f"Running update script: {full_path}")
-                out = subprocess.run(
-                    [full_path],
-                    capture_output=True,
-                )
-                if out.returncode != 0:
-                    log.error(
-                        f"{full_path} returned error code: {out.returncode}, program output:"  # noqa: E501
-                    )
-                    log.error(out.stdout.decode("utf-8"))
-                    notify(
-                        "System Updater",
-                        f"Error in update script: {file}, check logs for more info",
-                    )
-            else:
-                log.info(f"could not execute file {full_path}")
-
-
 def run_updates(system, system_update_available):
     process_uid = os.getuid()
     filelock_path = "/run/ublue-update.lock"
@@ -120,7 +96,6 @@ def run_updates(system, system_update_available):
     fd = acquire_lock(filelock_path)
     if fd is None:
         raise Exception("updates are already running for this user")
-    root_dir = "/etc/ublue-update.d"
 
     """Wait on any existing transactions to complete before updating"""
     transaction_wait()
@@ -139,7 +114,18 @@ def run_updates(system, system_update_available):
         if system:
             users = []
 
-        run_update_scripts(f"{root_dir}/system/")
+        """System"""
+        out = subprocess.run(
+            [
+                "/usr/bin/topgrade",
+                "--config",
+                "/usr/share/ublue-update/topgrade-system.toml"
+            ],
+            capture_output=True,
+        )
+        log.debug(out.stdout.decode("utf-8"))
+
+        """Users"""
         for user in users:
             try:
                 xdg_runtime_dir = get_xdg_runtime_dir(user["User"])
@@ -160,7 +146,7 @@ def run_updates(system, system_update_available):
                     f"DBUS_SESSION_BUS_ADDRESS=unix:path={xdg_runtime_dir}/bus",
                     "/usr/bin/topgrade",
                     "--config",
-                    "/etc/ublue-update/topgrade-user.toml",
+                    "/usr/share/ublue-update/topgrade-user.toml",
                 ],
                 capture_output=True,
             )

ublue-update.spec

@@ -44,14 +44,12 @@ ls
 ls src
 black src
 flake8 src
-black files/etc/%{NAME}.d/system/*.py
-flake8 files/etc/%{NAME}.d/system/*.py
 %pyproject_wheel
 
 %install
 %pyproject_install
 %pyproject_save_files ublue_update
-cp -rp files/etc files/usr %{buildroot}
+cp -rp files/usr %{buildroot}
 
 %pre
 if [ ! -x /usr/bin/topgrade ]
@@ -72,8 +70,8 @@ fi
 %attr(0644,root,root) %{_exec_prefix}/lib/systemd/system/%{NAME}.timer
 %attr(0644,root,root) %{_exec_prefix}/lib/systemd/system-preset/00-%{NAME}.preset
 %attr(0644,root,root) %{_exec_prefix}/etc/%{NAME}/*.toml
-%attr(0755,root,root) %{_sysconfdir}/%{NAME}.d/system/*
-%attr(0644,root,root) %{_exec_prefix}/etc/polkit-1/rules.d/%{NAME}.rules
+%attr(0644,root,root) %{_datadir}/%{NAME}/*.toml
+%attr(0644,root,root) %{_datadir}/polkit-1/rules.d/%{NAME}.rules
 
 %changelog
 %autochangelog