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

feat: replace fedora-39 with fedora-42, fix package installer

Browse source
This commit is contained in:
Rudra Saraswat 2025-04-24 00:05:46 +01:00
parent fce7c69dc7
commit 6bee27bb0d
3 changed files with 9 additions and 8 deletions

4
blend
View file

@ -87,9 +87,9 @@ def error(err):
distro_map = {
'arch-linux': 'docker.io/library/archlinux',
'arch-linux': 'quay.io/toolbx/arch-toolbox:latest',
'debian': 'quay.io/toolbx-images/debian-toolbox:testing',
'fedora-39': 'registry.fedoraproject.org/fedora-toolbox:39',
'fedora-42': 'quay.io/fedora/fedora-toolbox:42',
'centos': 'quay.io/toolbx-images/centos-toolbox:latest',
'ubuntu-22.04': 'quay.io/toolbx/ubuntu-toolbox:22.04',
'ubuntu-24.04': 'quay.io/toolbx/ubuntu-toolbox:24.04',

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

@ -88,7 +88,7 @@
<script>
const ipc = require('electron').ipcRenderer
package_name = require('path').basename(require('@electron/remote').process.argv[3])
package_name = require('path').basename(require('@electron/remote').process.argv.slice(-1)[0])
package_type = 'deb'
if (package_name.endsWith('.deb')) {
@ -98,12 +98,13 @@
document.getElementById('source_select').innerHTML = `
<option>Debian</option>
<option>Ubuntu 22.04</option>
<option>Ubuntu 24.04</option>
`
} else if (package_name.endsWith('.rpm')) {
document.getElementById('packaging-format').src = '../static/RPM.svg'
package_type = 'rpm'
document.getElementById('source_select').innerHTML = `
<option>Fedora 39</option>
<option>Fedora 42</option>
<option>CentOS</option>
`
} else if (package_name.endsWith('.apk')) {
@ -127,7 +128,7 @@
function install_package() {
if (package_type == 'apk') {
document.getElementById('install-button').disabled = true
require('child_process').spawnSync('waydroid', ['app', 'install', require('@electron/remote').process.argv[3]])
require('child_process').spawnSync('waydroid', ['app', 'install', require('@electron/remote').process.argv.slice(-1)[0]])
document.getElementById('install-button').innerHTML = 'Installed'
require('child_process').spawnSync('rm', ['-rf', install_dir])
} else {
@ -135,7 +136,7 @@
timestamp = Math.floor(new Date().getTime() / 1000)
install_dir = `${require('os').homedir()}/.cache/package-installer/${timestamp}`
require('child_process').spawnSync('mkdir', ['-p', install_dir])
require('child_process').spawnSync('cp', [require('@electron/remote').process.argv[3], install_dir])
require('child_process').spawnSync('cp', [require('@electron/remote').process.argv.slice(-1)[0], install_dir])
install_command = ''
if (package_type == 'deb') {
install_command = `apt install -y ${install_dir}/${package_name}`
@ -164,4 +165,4 @@
</script>
</body>
</html>
</html>

2
blend-settings/src/pages/containers.html
View file

@ -13,7 +13,7 @@
<option selected>Arch Linux</option>
<option>Debian</option>
<option>CentOS</option>
<option>Fedora 39</option>
<option>Fedora 42</option>
<option>Ubuntu 22.04</option>
<option>Ubuntu 24.04 LTS</option>
</select>