nevaforget/moonarch-pkgbuilds
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix file conflicts with foot and waybar packages

Browse Source
This commit is contained in:
nevaforget 2026-03-30 22:33:11 +02:00
parent d827c689b0
commit 6895fa55b4
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
moonarch-git/PKGBUILD
View File

@ -115,6 +115,8 @@ package() {
while IFS= read -r -d '' file; do while IFS= read -r -d '' file; do
local _rel="${file#"$_xdg_src/"}" local _rel="${file#"$_xdg_src/"}"
[[ "$_rel" == "walker/config.toml" ]] && continue [[ "$_rel" == "walker/config.toml" ]] && continue
[[ "$_rel" == "foot/foot.ini" ]] && continue
[[ "$_rel" == "waybar/style.css" ]] && continue
if [[ "$file" == *.sh ]]; then if [[ "$file" == *.sh ]]; then
install -Dm755 "$file" "$pkgdir/etc/xdg/$_rel" install -Dm755 "$file" "$pkgdir/etc/xdg/$_rel"
else else
@ -155,6 +157,12 @@ package() {
install -Dm644 defaults/xdg/walker/config.toml \ install -Dm644 defaults/xdg/walker/config.toml \
"$pkgdir/usr/share/moonarch/walker-config.toml" "$pkgdir/usr/share/moonarch/walker-config.toml"
# --- Configs owned by other packages (deployed by .install, not owned here) ---
install -Dm644 defaults/xdg/foot/foot.ini \
"$pkgdir/usr/share/moonarch/foot/foot.ini"
install -Dm644 defaults/xdg/waybar/style.css \
"$pkgdir/usr/share/moonarch/waybar/style.css"
# --- Reference configs for greetd/moongreet (deployed by .install, not owned) --- # --- Reference configs for greetd/moongreet (deployed by .install, not owned) ---
install -Dm644 defaults/etc/greetd/config.toml \ install -Dm644 defaults/etc/greetd/config.toml \
"$pkgdir/usr/share/moonarch/greetd/config.toml" "$pkgdir/usr/share/moonarch/greetd/config.toml"

6
moonarch-git/moonarch.install
View File

@ -19,6 +19,12 @@ post_install() {
cp /usr/share/moonarch/moongreet/moongreet.toml /etc/moongreet/moongreet.toml cp /usr/share/moonarch/moongreet/moongreet.toml /etc/moongreet/moongreet.toml
fi fi
# Deploy foot config (file owned by foot package, overwrite deliberately)
cp /usr/share/moonarch/foot/foot.ini /etc/xdg/foot/foot.ini
# Deploy waybar style (file owned by waybar package, overwrite deliberately)
cp /usr/share/moonarch/waybar/style.css /etc/xdg/waybar/style.css
# Deploy Walker config override to skel and existing user homes. # Deploy Walker config override to skel and existing user homes.
# Only copies if user has no config yet — never overwrites manual edits. # Only copies if user has no config yet — never overwrites manual edits.
install -Dm644 /usr/share/moonarch/walker-config.toml \ install -Dm644 /usr/share/moonarch/walker-config.toml \