From 0ca3f6991a7c8352423a1b2673d91941917cfcb2 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Thu, 8 Jan 2009 20:48:47 +0100
Subject: reworked scripts

sync of overlays is now possible
sync gives output prepended with the overlay name
to enable sync set $SYNC in the overlay configuration
to the command that should be executed in the directory
of the overlay to sync it
---
 postsync.d/50-eix-update  | 33 ----------------------------
 postsync.d/eix-update     | 56 +++++++++++++++++++++++++++++++++++++++++++++++
 postsync.d/regen-overlays | 45 ++++++++++---------------------------
 3 files changed, 67 insertions(+), 67 deletions(-)
 delete mode 100755 postsync.d/50-eix-update
 create mode 100755 postsync.d/eix-update

(limited to 'postsync.d')

diff --git a/postsync.d/50-eix-update b/postsync.d/50-eix-update
deleted file mode 100755
index e9eb5ac..0000000
--- a/postsync.d/50-eix-update
+++ /dev/null
@@ -1,33 +0,0 @@
-EIXCACHE=$(update-eix --print EIX_CACHEFILE)
-OVERLAY_CONFIG_DIR="$(update-eix --print EIXCFGDIR)/overlays"
-
-TMPFILE=""
-if [ -r "${EIXCACHE}" ]; then
-	TMPFILE=$(mktemp -t eix.cache.XXXXXXXX)
-	cp "${EIXCACHE}" "${TMPFILE}"
-fi
-
-OVERLAY_PARAM=""
-for overlay_config in $(ls ${OVERLAY_CONFIG_DIR}); do
-	unset LOCATION
-	unset SYNC
-	unset CACHE_FORMAT
-
-	source ${OVERLAY_CONFIG_DIR}/${overlay_config}
-	if [[ -n ${LOCATION} ]]; then
-		OVERLAY_PARAM="${OVERLAY_PARAM} --add-overlay ${LOCATION}"
-
-		if [[ -n ${CACHE_FORMAT} ]]; then
-			OVERLAY_PARAM="${OVERLAY_PARAM} -m ${LOCATION} ${CACHE_FORMAT}"
-		fi
-	fi
-done
-
-[ -x /usr/bin/update-eix ] && /usr/bin/update-eix ${OVERLAY_PARAM}
-
-if [ -r "${EIXCACHE}" -a -r "${TMPFILE}" ]; then
-	echo
-	diff-eix "${TMPFILE}"
-	echo
-	rm -f "${TMPFILE}"
-fi
diff --git a/postsync.d/eix-update b/postsync.d/eix-update
new file mode 100755
index 0000000..00c6bd9
--- /dev/null
+++ b/postsync.d/eix-update
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+. /etc/init.d/functions.sh
+
+EIXCACHE=$(update-eix --print EIX_CACHEFILE)
+OVERLAY_CONFIG_DIR="$(update-eix --print EIXCFGDIR)/overlays"
+
+TMPFILE=""
+if [ -r "${EIXCACHE}" ]; then
+	TMPFILE=$(mktemp -t eix.cache.XXXXXXXX)
+	cp "${EIXCACHE}" "${TMPFILE}"
+fi
+
+OVERLAY_PARAM=""
+for overlay_config in $(ls ${OVERLAY_CONFIG_DIR}); do
+	unset LOCATION
+	unset SYNC
+	unset CACHE_FORMAT
+
+	source ${OVERLAY_CONFIG_DIR}/${overlay_config}
+	if [[ -n "${LOCATION}" ]]; then
+		if [[ ! -d "${LOCATION}" ]]; then
+			mkdir -p "${LOCATION}"
+		fi
+
+		OVERLAY_PARAM="${OVERLAY_PARAM} --add-overlay ${LOCATION}"
+
+		if [[ -n ${CACHE_FORMAT} ]]; then
+			OVERLAY_PARAM="${OVERLAY_PARAM} -m ${LOCATION} ${CACHE_FORMAT}"
+		fi
+
+		OVERLAY_NAME="$(echo ${overlay_config} | sed 's/\.[^\.]*$//')"
+		if [[ -n ${SYNC} ]]; then
+			echo
+			pushd ${LOCATION} > /dev/null 2>&1
+			${SYNC} 2>&1 | sed -ue "s/^/${OVERLAY_NAME}> /g"
+		
+			if [[ "0" -ne "${PIPESTATUS[0]}" ]]; then
+				ewarn "Sync of ${OVERLAY_NAME} failed"
+			fi
+
+			popd > /dev/null 2>&1
+		fi
+	fi
+done
+
+echo 
+
+[ -x /usr/bin/update-eix ] && /usr/bin/update-eix ${OVERLAY_PARAM}
+
+if [ -r "${EIXCACHE}" -a -r "${TMPFILE}" ]; then
+	echo
+	diff-eix "${TMPFILE}"
+	echo
+	rm -f "${TMPFILE}"
+fi
diff --git a/postsync.d/regen-overlays b/postsync.d/regen-overlays
index 4788e85..bbaec32 100755
--- a/postsync.d/regen-overlays
+++ b/postsync.d/regen-overlays
@@ -1,44 +1,19 @@
 #!/bin/bash
+
+. /etc/init.d/functions.sh
+
 OVERLAY_CONFIG_DIR="$(update-eix --print EIXCFGDIR)/overlays"
 
-# error
-eecho() {
-	case "x${NOCOLOR}" in
-		x[y,Y][e,E][s,S]|x-[t,T][r,R][u,U][e,E]|x)
-			echo -ne '\e[1;31m * \e[0m';;
-		x*)
-			echo -n " * ";;
-	esac
-
-	echo "$*"
-}
-
-# warning
-wecho() {
-	case "x${NOCOLOR}" in
-		x[y,Y][e,E][s,S]|x-[t,T][r,R][u,U][e,E]|x)
-			echo -ne '\e[1;33m * \e[0m';;
-		x*)
-			echo -n " * ";;
-	esac
-
-	echo "$*"
-}
-
-# info
-iecho() {
-	echo ">>> $*"
-}
-
-iecho "Regenerating overlay config ..."
+ebegin "Regenerating overlay config ..."
 
 if [ ! -d "${OVERLAY_CONFIG_DIR}" ] ; then
-	eecho "${OVERLAY_CONFIG_DIR} does not exists!"
+	eerror "${OVERLAY_CONFIG_DIR} does not exists!"
+	eend 1
 	return 1 
 fi
 
 if [ ! -f "${OVERLAY_CONFIG_DIR}/make.conf" ] ;  then
-	wecho "${OVERLAY_CONFIG_DIR}/make.conf does not exists, creating..."
+	ewarn "${OVERLAY_CONFIG_DIR}/make.conf does not exists, creating..."
 	touch "${OVERLAY_CONFIG_DIR}/make.conf"
 fi 
 
@@ -49,7 +24,7 @@ for overlay_config in $(ls ${OVERLAY_CONFIG_DIR}); do
 
 	if [[ "${overlay_config}" != "make.conf" ]] ; then
 	    source ${OVERLAY_CONFIG_DIR}/${overlay_config}
-   		if [[ -n "${LOCATION}" ]]; then
+   		if [[ -n "${LOCATION}" && -d "${LOCATION}" ]]; then
        		echo "	${LOCATION}" >> "${OVERLAY_CONFIG_DIR}/make.conf"
 		fi
 	fi
@@ -58,5 +33,7 @@ done
 echo "\"" >> "${OVERLAY_CONFIG_DIR}/make.conf"
 
 if [[ -z "$(grep "^[ \t]*source ${OVERLAY_CONFIG_DIR}/make.conf" /etc/make.conf)" ]] ; then
-	wecho "\"source ${OVERLAY_CONFIG_DIR}/make.conf\" not found in /etc/make.conf"
+	ewarn "\"source ${OVERLAY_CONFIG_DIR}/make.conf\" not found in /etc/make.conf"
 fi
+
+eend 0
-- 
cgit v1.2.3