summaryrefslogtreecommitdiff
path: root/raveos-calamares-theme
diff options
context:
space:
mode:
Diffstat (limited to 'raveos-calamares-theme')
-rw-r--r--raveos-calamares-theme/PKGBUILD2
-rwxr-xr-xraveos-calamares-theme/etc/calamares/modules/raveos-chown-homes.sh2
-rwxr-xr-xraveos-calamares-theme/etc/calamares/modules/raveos-copy-brave-profile.sh1
-rw-r--r--raveos-calamares-theme/etc/calamares/modules/shellprocess-enableservices.conf1
4 files changed, 4 insertions, 2 deletions
diff --git a/raveos-calamares-theme/PKGBUILD b/raveos-calamares-theme/PKGBUILD
index 8a6b563..7bbf6e7 100644
--- a/raveos-calamares-theme/PKGBUILD
+++ b/raveos-calamares-theme/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: nippy <nippy@tuta.io>
pkgname=raveos-calamares-theme
pkgver=2.0.0
-pkgrel=57
+pkgrel=59
pkgdesc="RaveOS Calamares Theme"
arch=('any')
url="https://git.rp1.hu/RaveOS"
diff --git a/raveos-calamares-theme/etc/calamares/modules/raveos-chown-homes.sh b/raveos-calamares-theme/etc/calamares/modules/raveos-chown-homes.sh
index acabd6c..f271c05 100755
--- a/raveos-calamares-theme/etc/calamares/modules/raveos-chown-homes.sh
+++ b/raveos-calamares-theme/etc/calamares/modules/raveos-chown-homes.sh
@@ -9,7 +9,7 @@ ROOT="${1:-}"
PASSWD="$ROOT/etc/passwd"
[ -f "$PASSWD" ] || { echo "raveos-chown-homes: $PASSWD hiányzik"; exit 0; }
-while IFS=: read -r user _ uid gid _ _ home _; do
+while IFS=: read -r user _ uid gid _ home _; do
[ -n "$user" ] || continue
case "$uid" in
''|*[!0-9]*) continue ;;
diff --git a/raveos-calamares-theme/etc/calamares/modules/raveos-copy-brave-profile.sh b/raveos-calamares-theme/etc/calamares/modules/raveos-copy-brave-profile.sh
index 1ca2fba..59a24d6 100755
--- a/raveos-calamares-theme/etc/calamares/modules/raveos-copy-brave-profile.sh
+++ b/raveos-calamares-theme/etc/calamares/modules/raveos-copy-brave-profile.sh
@@ -20,5 +20,6 @@ DEST="/home/$USERNAME/.config/BraveSoftware"
mkdir -p "$ROOT$DEST"
cp -a "$SRC" "$ROOT$DEST/Brave-Origin"
chown -R "$UID_GID" "$ROOT$DEST"
+chown "$UID_GID" "$ROOT/home/$USERNAME/.config" 2>/dev/null || true
echo "raveos-copy-brave-profile: $DEST/Brave-Origin kész"
diff --git a/raveos-calamares-theme/etc/calamares/modules/shellprocess-enableservices.conf b/raveos-calamares-theme/etc/calamares/modules/shellprocess-enableservices.conf
index 5d9616d..45b4339 100644
--- a/raveos-calamares-theme/etc/calamares/modules/shellprocess-enableservices.conf
+++ b/raveos-calamares-theme/etc/calamares/modules/shellprocess-enableservices.conf
@@ -17,4 +17,5 @@ script:
- command: "systemctl disable hibernate.target hybrid-sleep.target geoclue.service || true"
- command: "systemctl mask hibernate.target hybrid-sleep.target geoclue.service || true"
- command: "systemctl enable reflector-once.service || true"
+ - command: "if pacman -Qq dbus-broker-units >/dev/null 2>&1 && pacman -Qq gnome-session >/dev/null 2>&1; then pacman -Rdd --noconfirm dbus-broker-units dbus-broker && pacman -S --noconfirm dbus-daemon-units; fi"
name: "Enabling services and Display Managers"