summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemse2013-11-10 12:10:15 +0100
committerGravatar Tom Willemse2013-11-10 12:10:15 +0100
commit63b15ce804073328467a8af67532a1a34bb2910c (patch)
treea466d1e7aace4a087c43ed707ddd00e4200a67e2
downloadpacmerge-63b15ce804073328467a8af67532a1a34bb2910c.tar.gz
pacmerge-63b15ce804073328467a8af67532a1a34bb2910c.zip
Initial commit
-rwxr-xr-xpacmerge16
1 files changed, 16 insertions, 0 deletions
diff --git a/pacmerge b/pacmerge
new file mode 100755
index 0000000..55654f1
--- /dev/null
+++ b/pacmerge
@@ -0,0 +1,16 @@
+#!/bin/zsh
+
+emacs --daemon=pacmerge
+
+for itm in $(find /etc/ -type f -name "*.pacnew"); do
+ local orig="${itm%.pacnew}"
+ if [[ -f "${orig}" ]]; then
+ emacsclient -s pacmerge -c -eval \
+ "(emerge-files nil \"${orig}\" \"${itm}\" \"${orig}\" nil \
+ (lambda () (server-save-buffers-kill-terminal nil)))"
+ fi
+
+ rm $itm
+done
+
+emacsclient -s pacmerge -eval "(kill-emacs)"