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

feat: add support for debian, kali and neurodebian

Browse source
This commit is contained in:
Rudra Saraswat 2023-05-16 23:12:52 +05:30
parent 3e8089d2dd
commit 065ff8ec2a
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
blend
View file

@ -88,6 +88,10 @@ def error(err):
distro_map = { distro_map = {
'arch': 'docker.io/library/archlinux', 'arch': 'docker.io/library/archlinux',
'debian': 'docker.io/library/debian:latest',
'neurodebian': 'docker.io/library/neurodebian:nd120',
'kali-linux-rolling': 'docker.io/kalilinux/kali-rolling',
'kali-linux-rolling': 'docker.io/kalilinux/kali-rolling',
'fedora-rawhide': 'docker.io/library/fedora:rawhide', 'fedora-rawhide': 'docker.io/library/fedora:rawhide',
'ubuntu-22.04': 'docker.io/library/ubuntu:22.04', 'ubuntu-22.04': 'docker.io/library/ubuntu:22.04',
'ubuntu-23.04': 'docker.io/library/ubuntu:23.04' 'ubuntu-23.04': 'docker.io/library/ubuntu:23.04'

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

@ -11,6 +11,9 @@
<div class="col-sm-4"> <div class="col-sm-4">
<select class="form-control" id="inputContainerDistro"> <select class="form-control" id="inputContainerDistro">
<option selected>Arch</option> <option selected>Arch</option>
<option>Debian</option>
<option>Neurodebian Bookworm</option>
<option>Kali Linux Rolling</option>
<option>Fedora Rawhide</option> <option>Fedora Rawhide</option>
<option>Ubuntu 22.04</option> <option>Ubuntu 22.04</option>
<option>Ubuntu 23.04</option> <option>Ubuntu 23.04</option>

6
init-blend
View file

@ -111,8 +111,8 @@ if command -v apt-get &>/dev/null; then
apt-get update &>/dev/null apt-get update &>/dev/null
DEBIAN_FRONTEND=noninteractive apt-get -y install bash bc curl less wget apt-utils apt-transport-https dialog \ DEBIAN_FRONTEND=noninteractive apt-get -y install bash bc curl less wget apt-utils apt-transport-https dialog \
diffutils findutils gnupg2 sudo time util-linux libnss-myhostname \ diffutils findutils gnupg2 sudo time util-linux libnss-myhostname \
libvte-2.9[0-9]-common libvte-common lsof ncurses-base passwd inotify-tools \ lsof ncurses-base passwd inotify-tools pinentry-curses libegl1-mesa \
pinentry-curses libegl1-mesa libgl1-mesa-glx libvulkan1 mesa-vulkan-drivers &>/dev/null libgl1-mesa-glx libvulkan1 mesa-vulkan-drivers &>/dev/null
elif command -v pacman &>/dev/null; then elif command -v pacman &>/dev/null; then
pacman --noconfirm -Syyu &>/dev/null pacman --noconfirm -Syyu &>/dev/null
@ -450,7 +450,7 @@ inotifywait -m /usr/share/applications /usr/bin -e create,delete,move 2>/dev/nul
ICON_PATH="$(find /usr/share/icons/hicolor -type f -iname "*${line:5}*" -print -quit 2>/dev/null)" ICON_PATH="$(find /usr/share/icons/hicolor -type f -iname "*${line:5}*" -print -quit 2>/dev/null)"
mkdir -p "$(dirname "${ICON_PATH}" | sed 's/\/usr\/share/'"\/home\/${_uname}"'\/.local\/share/g')" mkdir -p "$(dirname "${ICON_PATH}" | sed 's/\/usr\/share/'"\/home\/${_uname}"'\/.local\/share/g')"
FINAL_ICON_PATH="$(dirname "${ICON_PATH}" | sed 's/\/usr\/share/'"\/home\/${_uname}"'\/.local\/share/g')/$(echo "${file%.*}").$(basename "${ICON_PATH}" | sed 's/^.*\.//')" FINAL_ICON_PATH="$(dirname "${ICON_PATH}" | sed 's/\/usr\/share/'"\/home\/${_uname}"'\/.local\/share/g')/$(echo "${file%.*}").$(basename "${ICON_PATH}" | sed 's/^.*\.//')"
cp "${ICON_PATH}" "${FINAL_ICON_PATH}" cp "${ICON_PATH}" "${FINAL_ICON_PATH}" &>/dev/null
echo "Icon=${FINAL_ICON_PATH}" >> "${HOME}/.local/share/applications/blend;${CONTAINER_NAME};${file}" echo "Icon=${FINAL_ICON_PATH}" >> "${HOME}/.local/share/applications/blend;${CONTAINER_NAME};${file}"
fi fi
else else