Get PORTDIR via portageq and make OVERLAY editable via environment

3 files changed, 5 insertions, 6 deletions

diff --git a/scripts/commit-xfce-sync.sh b/scripts/commit-xfce-sync.sh
index 11bd9ac..bad7e55 100755
--- a/scripts/commit-xfce-sync.sh
+++ b/scripts/commit-xfce-sync.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-OVERLAY=/home/angelos/overlays/xfce
+: ${OVERLAY=/home/angelos/overlays/xfce}
 
 pushd "${OVERLAY}" >/dev/null
 for i in $(git status --porcelain|grep ebuild|awk '{ print $2 }'); do
diff --git a/scripts/sync-xfce-overlay.sh b/scripts/sync-xfce-overlay.sh
index cb3b916..7b76fa1 100755
--- a/scripts/sync-xfce-overlay.sh
+++ b/scripts/sync-xfce-overlay.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
-OVERLAY="${HOME}/overlays/xfce"
-PORTDIR="${HOME}/gentoo-x86"
+: ${OVERLAY=${HOME}/overlays/xfce"
 
 # collect ebuilds
 pushd "${OVERLAY}" >/dev/null
@@ -9,6 +8,7 @@ pkgs=$(echo */*/*.ebuild)
 popd >/dev/null
 
 changes=0
+PORTDIR=$(portageq portdir)
 
 for i in ${pkgs}; do
 	# get cat/pkg
@@ -23,8 +23,7 @@ for i in ${pkgs}; do
 	srcheader=$(grep "^# \$Header: " ${src})
 
 	# get destination ebuild's header
-	dst="${OVERLAY}"/${CAT}/${PN}/${PN}-9999.ebuild
-	dst="${OVERLAY}"/${i}
+	dst=${OVERLAY}/${i}
 	dstheader=$(grep "^# \$Header: " ${dst})
 
 	if [ "${srcheader}" != "${dstheader}" ]; then
diff --git a/scripts/sync.sh b/scripts/sync.sh
index 6be8f74..0916dff 100755
--- a/scripts/sync.sh
+++ b/scripts/sync.sh
@@ -23,7 +23,7 @@ update_overlay() {
 	popd >/dev/null
 }
 
-pushd /home/angelos/gentoo-x86 >/dev/null
+pushd $(portageq portdir) >/dev/null
 run "Running cvs up" "cvs -Q up"
 popd >/dev/null
 einfo "Updating overlays"