askiiart-blendos/akshara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

merge into: askiiart-blendos:fix-rm-errored-update
Branches Tags
askiiart-blendos:main
askiiart-blendos:fix-rm-errored-update
askiiart-blendos:remove-unused-stuff
askiiart-blendos:packaging
askiiart-blendos:stable
...
pull from: askiiart-blendos:main
Branches Tags
askiiart-blendos:fix-rm-errored-update
askiiart-blendos:main
askiiart-blendos:remove-unused-stuff
askiiart-blendos:packaging
askiiart-blendos:stable
Sign in to create a new pull request.

2 commits
fix-rm-err ... main

Author SHA1 Message Date
askiiart
17784b6c7d
remove unused stuff 2025-04-28 13:30:48 -05:00
Asterisk
5bf806eea0 Merge branch 'fix-arch-repo' into 'main' 
Handle repos better

See merge request blendOS/system-tools/akshara!8
 2025-04-17 19:51:40 +00:00
1 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
akshara
View file

@ -19,15 +19,11 @@
import os import os
import sys import sys
import time
import yaml import yaml
import shutil
import filecmp import filecmp
import argparse import argparse
import requests import requests
import platform
import fasteners import fasteners
from threading import Event
import subprocess import subprocess
__version = '1.0.0' __version = '1.0.0'
@ -166,7 +162,6 @@ def update_system():
repo = "https://pkg-repo.blendos.co" repo = "https://pkg-repo.blendos.co"
elif not (repo.startswith("https://") or repo.startswith("http://")): elif not (repo.startswith("https://") or repo.startswith("http://")):
repo = "https://" + repo repo = "https://" + repo
if not os.path.isfile('/.update.tar.zst'): if not os.path.isfile('/.update.tar.zst'):
if exec('wget', '-q', '--show-progress', f'{bootstrap_repo}/iso/latest/archlinux-bootstrap-x86_64.tar.zst', '-O', '/.update.tar.zst') != 0: if exec('wget', '-q', '--show-progress', f'{bootstrap_repo}/iso/latest/archlinux-bootstrap-x86_64.tar.zst', '-O', '/.update.tar.zst') != 0:
warn('failed download') warn('failed download')
@ -224,10 +219,6 @@ def update_system():
'blend-files' 'blend-files'
] ]
keep = [
'/usr/share'
]
if (type(blend_release.get('impl')) == str and if (type(blend_release.get('impl')) == str and
type(blend_release.get('track')) != 'custom'): type(blend_release.get('track')) != 'custom'):
res = interpret_track(blend_release) res = interpret_track(blend_release)
@ -259,7 +250,7 @@ def update_system():
with open('/.new_rootfs/etc/pacman.d/mirrorlist', 'w') as pacman_mirrorlist_conf: with open('/.new_rootfs/etc/pacman.d/mirrorlist', 'w') as pacman_mirrorlist_conf:
pacman_mirrorlist_conf.write( pacman_mirrorlist_conf.write(
f'Server = {arch_repo}/$repo/os/$arch\n') f'Server = {arch_repo}/$repo/os/$arch\n')
exec_chroot('mkdir', '-p', '/var/cache/pacman/pkg') exec_chroot('mkdir', '-p', '/var/cache/pacman/pkg')
exec_chroot('rm', '-rf', '/var/cache/pacman/pkg') exec_chroot('rm', '-rf', '/var/cache/pacman/pkg')
@ -439,7 +430,6 @@ Server = {package_repo["repo-url"]}
exec('cp', '-ax', '/.new_rootfs/var/lib/pacman', '/.new.var.lib/pacman') exec('cp', '-ax', '/.new_rootfs/var/lib/pacman', '/.new.var.lib/pacman')
exec('mv', '.new_rootfs', '.update_rootfs') exec('mv', '.new_rootfs', '.update_rootfs')
exec('cp', '-ax', '/.update_rootfs/etc', '/.update_rootfs/usr/etc')
new_boot_files = [] new_boot_files = []