summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--eix-switch.sh17
-rwxr-xr-xpostsync.d/eix-update16
-rwxr-xr-xpostsync.d/regen-overlays2
3 files changed, 25 insertions, 10 deletions
diff --git a/eix-switch.sh b/eix-switch.sh
new file mode 100644
index 0000000..c3b8be7
--- /dev/null
+++ b/eix-switch.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+eix-update() {
+ if [ -x /usr/bin/eix-update ] ; then
+ /usr/bin/eix-update $@
+ else
+ [ -x /usr/bin/update-eix ] && /usr/bin/update-eix $@
+ fi
+}
+
+eix-diff() {
+ if [ -x /usr/bin/eix-diff ] ; then
+ /usr/bin/eix-diff $@
+ else
+ [ -x /usr/bin/diff-eix ] && /usr/bin/diff-eix $@
+ fi
+}
diff --git a/postsync.d/eix-update b/postsync.d/eix-update
index a94196f..729f5c4 100755
--- a/postsync.d/eix-update
+++ b/postsync.d/eix-update
@@ -2,8 +2,11 @@
. /etc/init.d/functions.sh
-EIXCACHE=$(update-eix --print EIX_CACHEFILE)
-OVERLAY_CONFIG_DIR="$(update-eix --print EIXCFGDIR)/overlays"
+# implement old/new switch for older versions of eix
+[ -r "$(dirname $0)/../eix-switch.sh" ] && . "$(dirname $0)/../eix-switch.sh"
+
+EIXCACHE=$(eix-update --print EIX_CACHEFILE)
+OVERLAY_CONFIG_DIR="$(dirname $0)/../overlays"
TMPFILE=""
if [ -r "${EIXCACHE}" ]; then
@@ -46,17 +49,12 @@ done
echo
-( [ -x /usr/bin/eix-update ] && /usr/bin/eix-update ${OVERLAY_PARAM} ) || ( [ -x /usr/bin/update-eix ] && /usr/bin/update-eix ${OVERLAY_PARAM} )
+eix-update ${OVERLAY_PARAM}
if [ -r "${EIXCACHE}" -a -r "${TMPFILE}" ]; then
echo
- if [ -x /usr/bin/eix-diff ] ; then
- eix-diff "${TMPFILE}"
- else
- [ -x /usr/bin/diff-eix ] && diff-eix "${TMPFILE}"
- fi
+ eix-diff "${TMPFILE}"
- echo
rm -f "${TMPFILE}"
fi
diff --git a/postsync.d/regen-overlays b/postsync.d/regen-overlays
index bbaec32..89d70dd 100755
--- a/postsync.d/regen-overlays
+++ b/postsync.d/regen-overlays
@@ -2,7 +2,7 @@
. /etc/init.d/functions.sh
-OVERLAY_CONFIG_DIR="$(update-eix --print EIXCFGDIR)/overlays"
+OVERLAY_CONFIG_DIR="$(dirname $0)/../overlays"
ebegin "Regenerating overlay config ..."