DeltaLima
/
nanodesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed debootstrap, use now connman-gtk as tray

This commit is contained in:
Marcus 2023-05-03 17:34:20 +02:00
parent 7c68e75884
commit 16479f771c
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
makeanything.sh
View File

@ -33,7 +33,7 @@ function message() {
;;
esac
if [ "$1" == "info" ] || [ "$1" == "error" ]
if [ "$1" == "info" ] || [ "$1" == "warn" ] || [ "$1" == "error" ]
then
MESSAGE=$2
else
@ -84,10 +84,11 @@ done
#DEBOOTSTRAP_SUITE="bullseye"
#DEBOOTSTRAP_OPTS="--extra-suites=bullseye-backports,bullseye-updates --components=main,contrib,non-free"
DEBOOTSTRAP_SUITE="bookworm"
DEBOOTSTRAP_OPTS="--extra-suites=${DEBOOTSTRAP_SUITE}-updates --components=main,contrib,non-free,non-free-firmware"
#DEBOOTSTRAP_OPTS="--extra-suites=${DEBOOTSTRAP_SUITE}-updates --components=main,contrib,non-free,non-free-firmware"
DEBOOTSTRAP_OPTS="--components=main,contrib,non-free,non-free-firmware"
message "running debootstrap $DEBOOTSTRAP_OPTS $DEBOOTSTRAP_SUITE $MIRROR"
sudo debootstrap ${DEBOOTSTRAP_OPTS} ${DEBOOTSTRAP_SUITE} build/chroot/ $MIRROR || sudo debootstrap ${DEBOOTSTRAP_SUITE} build/chroot/ $MIRROR
sudo debootstrap ${DEBOOTSTRAP_OPTS} ${DEBOOTSTRAP_SUITE} build/chroot/ $MIRROR || message warn "debootstrap exited with code $?"
message "copy xdgmenumaker deb file into chroot"
sudo cp deb/xdgmenumaker* build/chroot/tmp || error

3
nanodesk-files/etc/jwm/system.jwmrc
View File

@ -6,7 +6,6 @@
<!-- <Include>/etc/jwm/debian-menu</Include> -->
<Include>exec: xdgmenumaker -n -i -f jwm</Include>
<Separator/>
<Program icon="/usr/share/icons/Adwaita/scalable/legacy/preferences-system-network-symbolic.svg" label="Network settings">connman-gtk</TrayButton>
<Program icon="/usr/share/icons/Adwaita/scalable/devices/video-display-symbolic.svg" label="Display settings">arandr</TrayButton>
<Separator/>
<Restart label="Restart JWM" icon="/usr/share/icons/Adwaita/scalable/emblems/emblem-synchronizing-symbolic.svg"/>
@ -240,7 +239,7 @@
<StartupCommand>$(find ~/.screenlayout/ -type f -executable|head -n 1)</StartupCommand>
<StartupCommand>xscreensaver -no-splash</StartupCommand>
<StartupCommand>volumeicon</StartupCommand>
<StartupCommand>connman-ui-gtk</StartupCommand>
<StartupCommand>connman-gtk</StartupCommand>
<StartupCommand>dillo -f -g 640x480 /usr/share/doc/nanodesk/welcome/welcome.html</StartupCommand>
</JWM>

1
templates/install_base.tpl.sh
View File

@ -66,7 +66,6 @@ apt install -y \
wireless-tools \
wpagui \
connman-gtk \
connman-ui \
xserver-xorg \
xscreensaver \
xfonts-75dpi \