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

chore: update distros in package installer

Browse source
This commit is contained in:
Rudra Saraswat 2024-02-09 23:16:52 +05:30
parent 6589caf322
commit 1840bdab95
4 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
blend
View file

@ -144,7 +144,7 @@ def core_start_container(name, new_container=False):
exit(1) exit(1)
logproc = pexpect.spawn( logproc = pexpect.spawn(
'podman', args=['logs', '-f', '--since', str(start_time), name], timeout=300) 'podman', args=['logs', '-f', '--since', str(start_time), name], timeout=3600)
logproc.logfile_read = sys.stdout.buffer logproc.logfile_read = sys.stdout.buffer
logproc.expect('Started container.') logproc.expect('Started container.')

2
blend-settings/src/internal/js/android.js
View file

@ -50,7 +50,7 @@ function install_aurora_store() {
let aurora_store_worker = new Worker( let aurora_store_worker = new Worker(
`data:text/javascript, `data:text/javascript,
require('child_process').spawnSync('sh', ['-c', 'mkdir -p ~/.cache/blend-settings; rm -f ~/.cache/blend-settings/aurora.apk']) require('child_process').spawnSync('sh', ['-c', 'mkdir -p ~/.cache/blend-settings; rm -f ~/.cache/blend-settings/aurora.apk'])
let s1 = require('child_process').spawnSync('sh', ['-c', 'wget -O ~/.cache/blend-settings/aurora.apk https://gitlab.com/AuroraOSS/AuroraStore/uploads/bbc1bd5a77ab2b40bbf288ccbef8d1f0/AuroraStore_4.1.1.apk']).status let s1 = require('child_process').spawnSync('sh', ['-c', 'wget -O ~/.cache/blend-settings/aurora.apk https://auroraoss.com/AuroraStore/Stable/AuroraStore_4.4.1.apk']).status
if (s1 != 0) { if (s1 != 0) {
postMessage('failed') postMessage('failed')
} else { } else {

7
blend-settings/src/internal/js/system.js
View file

@ -18,6 +18,13 @@ function update_system() {
} }
function check_system_update() { function check_system_update() {
if (require('fs').existsSync('/.update')) {
document.getElementById('update-btn').onclick = () => {
require('child_process').spawnSync('reboot')
}
document.getElementById('update-btn').textContent = 'Reboot'
document.getElementById('update-btn').disabled = false
}
let start_update_worker = new Worker( let start_update_worker = new Worker(
`data:text/javascript, `data:text/javascript,
let s = require('child_process').spawnSync('systemctl', ['is-active', '--quiet', 'akshara-system-update']).status let s = require('child_process').spawnSync('systemctl', ['is-active', '--quiet', 'akshara-system-update']).status

13
blend-settings/src/package-installer.html
View file

@ -97,18 +97,14 @@
document.getElementById('source_select').innerHTML = ` document.getElementById('source_select').innerHTML = `
<option>Debian</option> <option>Debian</option>
<option>Ubuntu 23.04</option>
<option>Ubuntu 22.04</option> <option>Ubuntu 22.04</option>
<option>Kali Linux</option>
<option>Neurodebian Bookworm</option>
` `
} else if (package_name.endsWith('.rpm')) { } else if (package_name.endsWith('.rpm')) {
document.getElementById('packaging-format').src = '../static/RPM.svg' document.getElementById('packaging-format').src = '../static/RPM.svg'
package_type = 'rpm' package_type = 'rpm'
document.getElementById('source_select').innerHTML = ` document.getElementById('source_select').innerHTML = `
<option>Fedora 38</option> <option>Fedora 39</option>
<option>AlmaLinux 9</option> <option>CentOS</option>
<option>Rocky Linux</option>
` `
} else if (package_name.endsWith('.apk')) { } else if (package_name.endsWith('.apk')) {
document.getElementById('packaging-format').src = '../static/APK.svg' document.getElementById('packaging-format').src = '../static/APK.svg'
@ -117,15 +113,14 @@
require('fs').stat('/var/lib/waydroid/waydroid.prop', (err, stat) => { require('fs').stat('/var/lib/waydroid/waydroid.prop', (err, stat) => {
if (err != null) { if (err != null) {
document.getElementById('install-button').outerHTML = "<p>You'll need to initialize Android app support from the <b>blendOS Settings</b> app first.</p>" document.getElementById('install-button').outerHTML = "<p>You'll need to initialize Android app support from the <b>System</b> app first.</p>"
} }
}) })
} else if (package_name.includes('.pkg.tar')) { } else if (package_name.includes('.pkg.tar')) {
document.getElementById('packaging-format').src = '../static/PKG.svg' document.getElementById('packaging-format').src = '../static/PKG.svg'
package_type = 'pkg' package_type = 'pkg'
document.getElementById('source_select').innerHTML = ` document.getElementById('source_select').innerHTML = `
<option>Arch</option> <option>Arch Linux</option>
<option>Crystal Linux</option>
` `
} }