teldra/void-bash-installer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
teldra 2021-05-12 14:26:26 +02:00
parent d94dab208e
commit 20a210657a
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
files/xorg/dbus-launch.sh
View File

@ -1,3 +1,6 @@
if [ "$DESKTOP_SESSION" = "i3" ]; then
if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
eval "$(dbus-launch --sh-syntax --exit-with-x11)" eval "$(dbus-launch --sh-syntax --exit-with-x11)"
fi fi
fi

15
step3/20-basesystem
View File

@ -12,9 +12,16 @@ vmkdir() {
} }
vinstall() { vinstall() {
src=$1; tgt=$3; rights=$2 src="$1"; tgt="$3"; rights="$2"
cp -fr "${src}" /"${tgt}" if [ "$4" ]; then
chmod -R "${rights}" /"${tgt}" cp "${src}" "/${tgt}/${4}"
chmod="/${tgt}/${4}"
else
cp "${src}" "/${tgt}"
chmod="/${tgt}"
fi
chmod -R "${rights}" "${chmod}"
} }
vbin() { vbin() {
@ -56,7 +63,7 @@ vinstall "${FILESDIR}/nm/unmanaged-tun.conf" 644 etc/NetworkManager/conf.d
vinstall "${FILESDIR}/nm/30-wg0" 744 etc/NetworkManager/dispatcher.d vinstall "${FILESDIR}/nm/30-wg0" 744 etc/NetworkManager/dispatcher.d
vmkdir etc/profile.d vmkdir etc/profile.d
vinstall "${FILESDIR}/profile/append-path.sh" 644 etc/profile.d vinstall "${FILESDIR}/profile/append-path.sh" 644 etc/profile.d zz-append-path.sh
vmkdir usr/share/X11/xorg.conf.d vmkdir usr/share/X11/xorg.conf.d
vinstall "${FILESDIR}/xorg/10-keyboard.conf" 644 usr/share/X11/xorg.conf.d vinstall "${FILESDIR}/xorg/10-keyboard.conf" 644 usr/share/X11/xorg.conf.d