summaryrefslogtreecommitdiffstats
path: root/source/kde/kde
diff options
context:
space:
mode:
Diffstat (limited to 'source/kde/kde')
-rw-r--r--source/kde/kde/build/plasma-workspace2
-rw-r--r--source/kde/kde/doinst.sh/plasma-workspace14
-rw-r--r--source/kde/kde/post-install/plasma-workspace.post-install2
3 files changed, 16 insertions, 2 deletions
diff --git a/source/kde/kde/build/plasma-workspace b/source/kde/kde/build/plasma-workspace
index 0cfbf0888..00750edc0 100644
--- a/source/kde/kde/build/plasma-workspace
+++ b/source/kde/kde/build/plasma-workspace
@@ -1 +1 @@
-2
+3
diff --git a/source/kde/kde/doinst.sh/plasma-workspace b/source/kde/kde/doinst.sh/plasma-workspace
new file mode 100644
index 000000000..cb5080698
--- /dev/null
+++ b/source/kde/kde/doinst.sh/plasma-workspace
@@ -0,0 +1,14 @@
+config() {
+ NEW="$1"
+ OLD="$(dirname $NEW)/$(basename $NEW .new)"
+ # If there's no config file by that name, mv it over:
+ if [ ! -r $OLD ]; then
+ mv $NEW $OLD
+ elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+ # toss the redundant copy
+ rm $NEW
+ fi
+ # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/pam.d/kde.new
diff --git a/source/kde/kde/post-install/plasma-workspace.post-install b/source/kde/kde/post-install/plasma-workspace.post-install
index 4ba279a20..8f3839ec2 100644
--- a/source/kde/kde/post-install/plasma-workspace.post-install
+++ b/source/kde/kde/post-install/plasma-workspace.post-install
@@ -46,7 +46,7 @@ if [ "$SLACKPAM" == "no" ]; then
-i $PKG/usr/share/wayland-sessions/plasmawayland.desktop
else
# Install a PAM file for Plasma5 workspace:
- install -Dm644 $CWD/post-install/plasma-workspace/pam.d/kde $PKG/etc/pam.d/kde
+ install -Dm644 $CWD/post-install/plasma-workspace/pam.d/kde $PKG/etc/pam.d/kde.new
fi
if [ "$SLKELOGIND" == "yes" ]; then