feat: implement pulling tracks from repos, add a sample /system.yaml

akshara

@@ -23,9 +23,10 @@ import time
 import yaml
 import shutil
 import argparse
+import requests
 import platform
 import fasteners
-import threading
+from threading import Event
 import subprocess
 
 __version = '1.0.0'
@@ -99,6 +100,21 @@ def error(err):
           colors.reset + err + colors.reset)
 
 
+def interpret_track(blend_release):
+    result = yaml.safe_load(requests.get(blend_release.get('impl') + '/' + blend_release.get('track') + '.yaml', allow_redirects=True).content.decode())
+
+    if (type(result.get('impl')) == str and
+        type(result.get('track')) != 'custom'):
+        res = interpret_track(result)
+
+        for i in res.keys():
+            if type(res[i]) is list:
+                if type(result.get(i)) is list:
+                    result[i] = res[i] + result[i]
+
+    return result
+
+
 def update_system():
     if os.path.isdir('/.update_rootfs'):
         error('update already downloaded, you must reboot first')
@@ -163,17 +179,21 @@ def update_system():
         exec('rm', '-f', '/.new_rootfs/version')
 
         packages = [
-            'akshara',
-            'blend'
+            'akshara'
         ]
 
         services = [
             'akshara'
         ]
 
-        user_services = [
-            'blend-files'
-        ]
+        if (type(blend_release.get('impl')) == str and
+            type(blend_release.get('track')) != 'custom'):
+            res = interpret_track(blend_release)
+
+            for i in res.keys():
+                if type(res[i]) is list:
+                    if type(blend_release.get(i)) is list:
+                        blend_release[i] += res[i]
 
         if type(blend_release.get('packages')) == list:
             packages += blend_release.get('packages')
@@ -184,6 +204,10 @@ def update_system():
         if type(blend_release.get('user-services')) == list:
             user_services += blend_release.get('user-services')
 
+        print(blend_release)
+
+        exit(5)
+
         with open('/.new_rootfs/etc/pacman.d/mirrorlist', 'w') as pacman_mirrorlist_conf:
             pacman_mirrorlist_conf.write('Server = https://cloudflaremirrors.com/archlinux/$repo/os/$arch\n')
 
@@ -233,6 +257,13 @@ Server = {package_repo["repo-url"]}
                         error('update failed due to unsuccessful package downloads')
                         sys.exit(50)
 
+        if type(blend_release.get('commands')) == list:
+            for command in blend_release.get('commands'):
+                if type(command) == str:
+                    exec_chroot('bash', '-c', command)
+                elif type(command) == list:
+                    exec_chroot(*command)
+
         kernel_exists = False
 
         for f in os.listdir('/.new_rootfs/boot'):
@@ -268,9 +299,9 @@ Server = {package_repo["repo-url"]}
 def daemon():
     for dir in os.listdir('/'):
         if dir.startswith('.old.'):
-            shutil.rmtree('/' + dir)
+            exec('rm', '-rf', '/' + dir)
 
-    Event().wait()
+    Event.wait()
 
 
 description = f'''

akshara.hook

@@ -29,6 +29,7 @@ run_latehook() {
         # Create new /etc.
         rm -rf /new_root/.new_etc
         cp -a /new_root/etc /new_root/.new_etc
+        (cd /new_root/etc && find . -type f -print0 | grep -Fxvz -f <(cd "/new_root/.update_rootfs/etc" && find . -type f) | xargs -0 rm -rf)
         cp /new_root/.update_rootfs/etc/pacman.conf /new_root/.new_etc/pacman.conf
         rm -rf /new_root/.new_etc/pacman.d
         cp -a /new_root/.update_rootfs/etc/pacman.d /new_root/.new_etc/pacman.d
@@ -38,6 +39,8 @@ run_latehook() {
 
         # Successful update.
         rm -f /new_root/.etc-stage
+
+        mv /new_root/.update_rootfs /new_root/.old.update_rootfs
         touch /new_root/.successful-update
     fi
 }

akshara.install

@@ -4,6 +4,9 @@
 build() {
     add_module overlay
     add_binary bash
+    add_binary xargs
+    add_binary find
+    add_binary grep
     add_binary findmnt
     add_binary uname
     add_runscript

system.yaml.sample

@@ -0,0 +1,16 @@
+repo: 'https://pkg-repo.blendos.co/'
+
+impl: 'https://github.com/blend-os/tracks/raw/main'
+
+track: 'gnome'
+
+packages:
+    - 'micro'
+    - 'caddy'
+
+services:
+    - 'caddy'
+
+package-repos:
+    - name: 'chaotic-aur'
+      repo-url: 'https://cdn-mirror.chaotic.cx/$repo/$arch'