fix: prevent /etc/ merge issues (#43)

* fix: prevent /etc/ merge issues
discussed at length in #28
also including tons of comments about the issue

* fix: change references of /etc/ to /usr/etc
This commit is contained in:
Eino Rauhala
2023-04-26 18:23:43 +03:00
committed by GitHub
parent 37143b0e23
commit 085d26aa1a
5 changed files with 12 additions and 7 deletions

View File

@@ -26,7 +26,7 @@ distrobox-ubuntu:
setup-flatpaks:
#!/bin/bash
echo 'Installing flatpaks from the ublue recipe ...'
flatpaks=$(yq '.flatpaks[]' < /etc/ublue-recipe.yml)
flatpaks=$(yq '.flatpaks[]' < /usr/etc/ublue-recipe.yml)
for pkg in $flatpaks; do \
echo "Installing: ${pkg}" && \
flatpak install --user --noninteractive flathub $pkg; \

View File

@@ -1,6 +1,6 @@
if test "$(id -u)" -gt "0" && test -d "$HOME"; then
if test ! -e "$HOME"/.config/autostart/ublue-firstboot.desktop; then
mkdir -p "$HOME"/.config/autostart
cp -f /etc/skel.d/.config/autostart/ublue-firstboot.desktop "$HOME"/.config/autostart
cp -f /usr/etc/skel.d/.config/autostart/ublue-firstboot.desktop "$HOME"/.config/autostart
fi
fi

View File

@@ -1,7 +1,7 @@
[Desktop Entry]
Name=uBlue First Boot Setup
Comment=Sets up uBlue Desktop Correctly On FirstBoot
Exec=/usr/bin/yafti /etc/yafti.yml
Exec=/usr/bin/yafti /usr/etc/yafti.yml
Icon=org.gnome.Terminal
Type=Application
Categories=Utility;System;