[gentoo-commits] dev/angelos:master commit in: scripts/

[gentoo-commits] dev/angelos:master commit in: scripts/

[Christoph Mende]

commit:     f4d31af673c6f80c3e23ecace970abb13133c1a3
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 16:44:43 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 16:44:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=f4d31af6

Added my personal scripts

---
 scripts/commit-xfce-sync.sh  |   15 +++++++
 scripts/keywords.sh          |   91 ++++++++++++++++++++++++++++++++++++++++++
 scripts/mount-chroot.sh      |   32 +++++++++++++++
 scripts/sync-xfce-overlay.sh |   51 +++++++++++++++++++++++
 scripts/sync.sh              |   39 ++++++++++++++++++
 5 files changed, 228 insertions(+), 0 deletions(-)

diff --git a/scripts/commit-xfce-sync.sh b/scripts/commit-xfce-sync.sh
new file mode 100755
index 0000000..11bd9ac
--- /dev/null
+++ b/scripts/commit-xfce-sync.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+OVERLAY=/home/angelos/overlays/xfce
+
+pushd "${OVERLAY}" >/dev/null
+for i in $(git status --porcelain|grep ebuild|awk '{ print $2 }'); do
+	pkgs+=" $(dirname ${i})"
+done
+
+for i in ${pkgs}; do
+	pushd ${i} >/dev/null
+	repoman ci -m "$(basename ${i}): Sync with gentoo-x86"
+	popd >/dev/null
+done
+popd >/dev/null

diff --git a/scripts/keywords.sh b/scripts/keywords.sh
new file mode 100755
index 0000000..41ec0bc
--- /dev/null
+++ b/scripts/keywords.sh
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# TODO:
+# - support multiple arches with one call (auto-inject arch only if none was given, obsoletes "stable" symlink)
+# - parse atoms to void having to cd into PORTDIR/foo/bar
+# - support multiple packaegs with one call (depends on ^)
+# - support pybugz to remove arches from CC
+
+PKG_VERSION=0.1
+PKG_NAME=gkeywords
+
+BIN="$(basename $0)"
+
+if [ "${BIN}" == "gkw" ]; then
+	echo "Don't call this script directly, dumbass!" >&2
+	exit 1
+fi
+
+print_usage() {
+	echo "Usage:"
+	echo "  ${BIN} [OPTION...]"
+	echo
+	echo "Help Options:"
+	echo "  -h, --help	Show help options"
+	echo
+	echo "Application Options:"
+	echo "  -v, --version	Print the program version"
+	echo
+	exit 0
+}
+
+print_version() {
+	echo "${PKG_NAME} ${PKG_VERSION}"
+	echo "Copyright 2011 Christoph Mende <angelos@gentoo.org>"
+	exit 0
+}
+
+while getopts hv opt; do
+	case "$opt" in
+	h) print_usage ;;
+	v) print_version ;;
+	\?) print_usage ;;
+	esac
+done
+
+ebuild=$1
+bug=$2
+
+if ! [ -f "${ebuild}" ]; then
+	echo "ebuild not found" >&2
+	exit 1
+fi
+
+case $(uname -m) in
+	x86_64) ARCH="amd64";;
+	?) ARCH="$(uname -m)";;
+esac
+
+case ${BIN} in
+	stable)
+		string="Stable on ${ARCH}"
+		keyword="${ARCH}"
+		;;
+	keyword)
+		string="Add ~${ARCH}"
+		keyword="~${ARCH}"
+		;;
+	?)
+		echo "wat" >&2
+		exit 1
+		;;
+esac
+
+if [ -n "${bug}" ]; then
+	string+=" wrt bug #${bug}"
+fi
+
+if ! ekeyword ${keyword} ${ebuild}; then
+	echo "ekeyword failed" >&2
+	exit 1
+fi
+
+if ! echangelog "${string}"; then
+	echo "echangelog failed" >&2
+	exit 1
+fi
+
+if ! repoman ci -m "${string}"; then
+	echo "repoman failed" >&2
+	exit 1
+fi

diff --git a/scripts/mount-chroot.sh b/scripts/mount-chroot.sh
new file mode 100755
index 0000000..b96dc44
--- /dev/null
+++ b/scripts/mount-chroot.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# TODO:
+# - dbus?
+# - init?
+
+if [ -z "$@" ]; then
+	echo "missing operand" >&2
+	exit 1
+fi
+
+if [ ! -d "$@"/dev ]; then
+	echo "no valid chroot environment" >&2
+	exit 1
+fi
+
+mount --bind /dev "$@"/dev
+mount --bind /dev/pts "$@"/dev/pts
+mount --bind /sys "$@"/sys
+mkdir -p "$@"/usr/portage
+mount --bind /home/angelos/gentoo-x86 "$@"/usr/portage
+mount --bind /home/angelos/distfiles "$@"/usr/portage/distfiles
+mount -t proc none "$@"/proc
+cp /etc/resolv.conf "$@"/etc
+
+if [ -x "$@${SHELL}" ]; then
+	exe=${SHELL}
+else
+	exe=/bin/bash
+fi
+
+chroot "$@" ${exe}

diff --git a/scripts/sync-xfce-overlay.sh b/scripts/sync-xfce-overlay.sh
new file mode 100755
index 0000000..5650228
--- /dev/null
+++ b/scripts/sync-xfce-overlay.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+OVERLAY="${HOME}/overlays/xfce"
+PORTDIR="${HOME}/gentoo-x86"
+
+# collect ebuilds
+pushd "${OVERLAY}" >/dev/null
+pkgs=$(echo */*/*.ebuild)
+popd >/dev/null
+
+changes=0
+
+for i in ${pkgs}; do
+	# get cat/pkg
+	atom=( $(qatom ${i/\/*\//\/}) )
+	CAT=${atom[0]}
+	PN=${atom[1]}
+
+	# get source ebuild's header
+	declare -a src
+	src=( ${PORTDIR}/${CAT}/${PN}/${PN}-*.ebuild )
+	src=${src[-1]}
+	srcheader=$(grep "^# \$Header: " ${src})
+
+	# get destination ebuild's header
+	dst="${OVERLAY}"/${CAT}/${PN}/${PN}-9999.ebuild
+	dstheader=$(grep "^# \$Header: " ${dst})
+
+	if [ "${srcheader}" != "${dstheader}" ]; then
+		# copy new ebuild
+		echo cp -f ${src} ${dst}
+
+		# remove any stabl keywords
+		ekeyword ~all ${dst} >/dev/null
+
+		# XXX remove this when xfconf-live merged into xfconf
+		# remove SRC_URI
+		sed -i -e "/^SRC_URI/d" ${dst}
+		# fix eclass usage
+		sed -i -e "/^inherit/s/xfconf/xfconf-live/" ${i}
+		sed -i -r "s/xfconf(_(src|pkg))/xfconf-live\1/" ${i}
+
+		changes+=1
+	fi
+done
+
+if [ ${changes} -gt 0 ]; then
+	echo ${changes} ebuilds synced, please review the changes
+else
+	echo Everything up to date
+fi

diff --git a/scripts/sync.sh b/scripts/sync.sh
new file mode 100755
index 0000000..6be8f74
--- /dev/null
+++ b/scripts/sync.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+. /etc/init.d/functions.sh
+
+run() {
+	ebegin $1
+	$2
+	eend $? || exit -1
+}
+
+update_overlay() {
+	einfo "Updating $@"
+	pushd "$@" >/dev/null
+	if [ -d .git ]; then
+		git pull -q
+	elif [ -d .svn ]; then
+		svn up -q
+	elif [ -d CVS ]; then
+		cvs -Q up
+	else
+		ewarn "Don't know how to update this repo"
+	fi
+	popd >/dev/null
+}
+
+pushd /home/angelos/gentoo-x86 >/dev/null
+run "Running cvs up" "cvs -Q up"
+popd >/dev/null
+einfo "Updating overlays"
+for x in $(portageq portdir_overlay); do
+	update_overlay "$x"
+done
+run "Regenerating cache" "egencache --update --jobs=4"
+run "Regenerating use.local.desc" "egencache --update-use-local-desc"
+cp /var/cache/eix /tmp/eix-cache.old
+run "Updating eix cache" "eix-update --quiet"
+eix-diff /tmp/eix-cache.old
+rm /tmp/eix-cache.old
+einfo "Sync complete!"

[gentoo-commits] dev/angelos:master commit in: scripts/

[Christoph Mende]

commit:     3f5a6ab4990665b12fb8ab7be7ff6a22ae322326
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 07:58:05 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 07:58:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=3f5a6ab4

mount-chroot: Don't bind distfiles/packages under PORTDIR

---
 scripts/mount-chroot.sh |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/scripts/mount-chroot.sh b/scripts/mount-chroot.sh
index b96dc44..3286359 100755
--- a/scripts/mount-chroot.sh
+++ b/scripts/mount-chroot.sh
@@ -19,7 +19,9 @@ mount --bind /dev/pts "$@"/dev/pts
 mount --bind /sys "$@"/sys
 mkdir -p "$@"/usr/portage
 mount --bind /home/angelos/gentoo-x86 "$@"/usr/portage
-mount --bind /home/angelos/distfiles "$@"/usr/portage/distfiles
+mkdir -p "$@"/root/{packages,distfiles}
+mount --bind /home/angelos/distfiles "$@"/root/distfiles
+mount --bind /home/angelos/packages "$@"/root/packages
 mount -t proc none "$@"/proc
 cp /etc/resolv.conf "$@"/etc
 

[gentoo-commits] dev/angelos:master commit in: scripts/

[Christoph Mende]

commit:     f8b3e6e0ba66770d6d3ae2c0a2daa57c1b63f26d
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 10:43:20 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 10:43:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=f8b3e6e0

sync-xfce-overlay.sh: fix cp/sed

---
 scripts/sync-xfce-overlay.sh |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/sync-xfce-overlay.sh b/scripts/sync-xfce-overlay.sh
index 5650228..a96cf55 100755
--- a/scripts/sync-xfce-overlay.sh
+++ b/scripts/sync-xfce-overlay.sh
@@ -24,11 +24,12 @@ for i in ${pkgs}; do
 
 	# get destination ebuild's header
 	dst="${OVERLAY}"/${CAT}/${PN}/${PN}-9999.ebuild
+	dst="${OVERLAY}"/${i}
 	dstheader=$(grep "^# \$Header: " ${dst})
 
 	if [ "${srcheader}" != "${dstheader}" ]; then
 		# copy new ebuild
-		echo cp -f ${src} ${dst}
+		cp -f ${src} ${dst}
 
 		# remove any stabl keywords
 		ekeyword ~all ${dst} >/dev/null
@@ -37,8 +38,8 @@ for i in ${pkgs}; do
 		# remove SRC_URI
 		sed -i -e "/^SRC_URI/d" ${dst}
 		# fix eclass usage
-		sed -i -e "/^inherit/s/xfconf/xfconf-live/" ${i}
-		sed -i -r "s/xfconf(_(src|pkg))/xfconf-live\1/" ${i}
+		sed -i -e "/^inherit/s/xfconf/xfconf-live/" ${dst}
+		sed -i -r "s/xfconf(_(src|pkg))/xfconf-live\1/" ${dst}
 
 		changes+=1
 	fi

[gentoo-commits] dev/angelos:master commit in: scripts/

[Christoph Mende]

commit:     304c53240d2df2487bba1fea77cae447b4332965
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 10:49:23 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 10:49:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=304c5324

sync-xfce-overlay.sh: fix changes counter

---
 scripts/sync-xfce-overlay.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/sync-xfce-overlay.sh b/scripts/sync-xfce-overlay.sh
index a96cf55..cb3b916 100755
--- a/scripts/sync-xfce-overlay.sh
+++ b/scripts/sync-xfce-overlay.sh
@@ -41,7 +41,7 @@ for i in ${pkgs}; do
 		sed -i -e "/^inherit/s/xfconf/xfconf-live/" ${dst}
 		sed -i -r "s/xfconf(_(src|pkg))/xfconf-live\1/" ${dst}
 
-		changes+=1
+		let changes="$changes + 1"
 	fi
 done
 

[gentoo-commits] dev/angelos:master commit in: scripts/

[Christoph Mende]

commit:     254f145951c7ddefd78b21cf4d4eb917ca9410d1
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 20:23:49 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 20:23:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=254f1459

Get PORTDIR via portageq and make OVERLAY editable via environment

---
 scripts/commit-xfce-sync.sh  |    2 +-
 scripts/sync-xfce-overlay.sh |    7 +++----
 scripts/sync.sh              |    2 +-
 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"

[gentoo-commits] dev/angelos:master commit in: scripts/

[Christoph Mende]

commit:     c00ee59e7214adb4027a314cd2516172569b6c0f
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 11:15:52 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 11:15:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=c00ee59e

Use portageq to get the overlay paths too

---
 scripts/commit-xfce-sync.sh  |    2 +-
 scripts/sync-xfce-overlay.sh |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/commit-xfce-sync.sh b/scripts/commit-xfce-sync.sh
index bad7e55..d4e7ab6 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="$(portageq get_repo_path / xfce-dev)"
 
 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 7b76fa1..b05b15c 100755
--- a/scripts/sync-xfce-overlay.sh
+++ b/scripts/sync-xfce-overlay.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-: ${OVERLAY=${HOME}/overlays/xfce"
+OVERLAY="$(portageq get_repo_path / xfce-dev)"
+PORTDIR="$(portageq portdir)"
 
 # collect ebuilds
 pushd "${OVERLAY}" >/dev/null
@@ -8,7 +9,6 @@ pkgs=$(echo */*/*.ebuild)
 popd >/dev/null
 
 changes=0
-PORTDIR=$(portageq portdir)
 
 for i in ${pkgs}; do
 	# get cat/pkg

[gentoo-commits] dev/angelos:master commit in: scripts/

[Christoph Mende]

commit:     2e2ec27b96c6b70e3e811222dc317283752884ea
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 08:37:51 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 08:37:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=2e2ec27b

Get paths via portageq

---
 scripts/mount-chroot.sh |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/mount-chroot.sh b/scripts/mount-chroot.sh
index 3286359..be97aaa 100755
--- a/scripts/mount-chroot.sh
+++ b/scripts/mount-chroot.sh
@@ -14,14 +14,18 @@ if [ ! -d "$@"/dev ]; then
 	exit 1
 fi
 
+PORTDIR="$(portageq portdir)"
+DISTDIR="$(portageq envvar DISTDIR)"
+PKGDIR="$(portageq envvar PKGDIR)"
+
 mount --bind /dev "$@"/dev
 mount --bind /dev/pts "$@"/dev/pts
 mount --bind /sys "$@"/sys
 mkdir -p "$@"/usr/portage
-mount --bind /home/angelos/gentoo-x86 "$@"/usr/portage
+mount --bind "${PORTDIR}" "$@"/usr/portage
 mkdir -p "$@"/root/{packages,distfiles}
-mount --bind /home/angelos/distfiles "$@"/root/distfiles
-mount --bind /home/angelos/packages "$@"/root/packages
+mount --bind "${DISTDIR}" "$@"/root/distfiles
+mount --bind "${PKGDIR}" "$@"/root/packages
 mount -t proc none "$@"/proc
 cp /etc/resolv.conf "$@"/etc
 

[gentoo-commits] dev/angelos:master commit in: scripts/

[Christoph Mende]

commit:     a3a36758e397b537bbdbab2f5494f888a6b64aae
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 06:23:17 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 06:23:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=a3a36758

Remove xfconf-live usage

---
 scripts/sync-xfce-overlay.sh |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/scripts/sync-xfce-overlay.sh b/scripts/sync-xfce-overlay.sh
index b05b15c..64c8431 100755
--- a/scripts/sync-xfce-overlay.sh
+++ b/scripts/sync-xfce-overlay.sh
@@ -33,12 +33,8 @@ for i in ${pkgs}; do
 		# remove any stabl keywords
 		ekeyword ~all ${dst} >/dev/null
 
-		# XXX remove this when xfconf-live merged into xfconf
 		# remove SRC_URI
 		sed -i -e "/^SRC_URI/d" ${dst}
-		# fix eclass usage
-		sed -i -e "/^inherit/s/xfconf/xfconf-live/" ${dst}
-		sed -i -r "s/xfconf(_(src|pkg))/xfconf-live\1/" ${dst}
 
 		let changes="$changes + 1"
 	fi

[gentoo-commits] dev/angelos:master commit in: scripts/

[Christoph Mende]

commit:     9853c020bfeaffc9b60052aa44b163c363d74fa7
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 10:36:33 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 10:36:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=9853c020

sync-xfce-overlay.sh: Remove keywords instead of dropping to ~arch

---
 scripts/sync-xfce-overlay.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/sync-xfce-overlay.sh b/scripts/sync-xfce-overlay.sh
index 64c8431..91c5a9e 100755
--- a/scripts/sync-xfce-overlay.sh
+++ b/scripts/sync-xfce-overlay.sh
@@ -30,8 +30,8 @@ for i in ${pkgs}; do
 		# copy new ebuild
 		cp -f ${src} ${dst}
 
-		# remove any stabl keywords
-		ekeyword ~all ${dst} >/dev/null
+		# remove any keywords
+		ekeyword ^all ${dst} >/dev/null
 
 		# remove SRC_URI
 		sed -i -e "/^SRC_URI/d" ${dst}

[gentoo-commits] dev/angelos:master commit in: scripts/

[Christoph Mende]

commit:     7fb955e5cd9227afd7ed5bcbda780fa86d472e1a
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 18:08:41 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 18:08:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=7fb955e5

Run eclean-dist and eclean-pkg after sync

---
 scripts/sync.sh |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/scripts/sync.sh b/scripts/sync.sh
index 0916dff..9e435c5 100755
--- a/scripts/sync.sh
+++ b/scripts/sync.sh
@@ -31,6 +31,8 @@ for x in $(portageq portdir_overlay); do
 	update_overlay "$x"
 done
 run "Regenerating cache" "egencache --update --jobs=4"
+run "Cleaning distfiles" "eclean-dist"
+run "Cleaning packages" "eclean-pkg"
 run "Regenerating use.local.desc" "egencache --update-use-local-desc"
 cp /var/cache/eix /tmp/eix-cache.old
 run "Updating eix cache" "eix-update --quiet"

[gentoo-commits] dev/angelos:master commit in: scripts/

[Christoph Mende]

commit:     f33da420f9bfdba5e9b36e1b4b56d4a31178c42f
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 18:09:27 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 18:09:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=f33da420

Don't use /root

---
 scripts/mount-chroot.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/mount-chroot.sh b/scripts/mount-chroot.sh
index be97aaa..17b45c1 100755
--- a/scripts/mount-chroot.sh
+++ b/scripts/mount-chroot.sh
@@ -23,9 +23,9 @@ mount --bind /dev/pts "$@"/dev/pts
 mount --bind /sys "$@"/sys
 mkdir -p "$@"/usr/portage
 mount --bind "${PORTDIR}" "$@"/usr/portage
-mkdir -p "$@"/root/{packages,distfiles}
-mount --bind "${DISTDIR}" "$@"/root/distfiles
-mount --bind "${PKGDIR}" "$@"/root/packages
+mkdir -p "$@"/{packages,distfiles}
+mount --bind "${DISTDIR}" "$@"/distfiles
+mount --bind "${PKGDIR}" "$@"/packages
 mount -t proc none "$@"/proc
 cp /etc/resolv.conf "$@"/etc
 

[gentoo-commits] dev/angelos:master commit in: scripts/

[Christoph Mende]

commit:     0177e1f7ae6726e718a72375865e42093937b65f
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 17:57:51 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 17:57:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=0177e1f7

sync: Run eclean with -q

---
 scripts/sync.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/sync.sh b/scripts/sync.sh
index 9e435c5..5f0d438 100755
--- a/scripts/sync.sh
+++ b/scripts/sync.sh
@@ -31,8 +31,8 @@ for x in $(portageq portdir_overlay); do
 	update_overlay "$x"
 done
 run "Regenerating cache" "egencache --update --jobs=4"
-run "Cleaning distfiles" "eclean-dist"
-run "Cleaning packages" "eclean-pkg"
+run "Cleaning distfiles" "eclean-dist -q"
+run "Cleaning packages" "eclean-pkg -q"
 run "Regenerating use.local.desc" "egencache --update-use-local-desc"
 cp /var/cache/eix /tmp/eix-cache.old
 run "Updating eix cache" "eix-update --quiet"

[gentoo-commits] dev/angelos:master commit in: scripts/

[Christoph Mende]

commit:     6a36abc1da43060585a45628bc5d8bbc79152c2a
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 13:26:04 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 13:26:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=6a36abc1

Make variables modifiable

---
 scripts/mount-chroot.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/mount-chroot.sh b/scripts/mount-chroot.sh
index 17b45c1..ad419c7 100755
--- a/scripts/mount-chroot.sh
+++ b/scripts/mount-chroot.sh
@@ -14,9 +14,9 @@ if [ ! -d "$@"/dev ]; then
 	exit 1
 fi
 
-PORTDIR="$(portageq portdir)"
-DISTDIR="$(portageq envvar DISTDIR)"
-PKGDIR="$(portageq envvar PKGDIR)"
+: ${PORTDIR="$(portageq portdir)"}
+: ${DISTDIR="$(portageq envvar DISTDIR)"}
+: ${PKGDIR="$(portageq envvar PKGDIR)"}
 
 mount --bind /dev "$@"/dev
 mount --bind /dev/pts "$@"/dev/pts

[gentoo-commits] dev/angelos:master commit in: scripts/

[Christoph Mende]

commit:     12d5ca8ee7c8290a7f5ab35c3aa5bc685ec05359
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  1 20:46:11 2012 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Sun Jul  1 20:46:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=12d5ca8e

Remove sync.sh, replaced by wired's update

---
 scripts/sync.sh |   41 -----------------------------------------
 1 files changed, 0 insertions(+), 41 deletions(-)

diff --git a/scripts/sync.sh b/scripts/sync.sh
deleted file mode 100755
index 5f0d438..0000000
--- a/scripts/sync.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/init.d/functions.sh
-
-run() {
-	ebegin $1
-	$2
-	eend $? || exit -1
-}
-
-update_overlay() {
-	einfo "Updating $@"
-	pushd "$@" >/dev/null
-	if [ -d .git ]; then
-		git pull -q
-	elif [ -d .svn ]; then
-		svn up -q
-	elif [ -d CVS ]; then
-		cvs -Q up
-	else
-		ewarn "Don't know how to update this repo"
-	fi
-	popd >/dev/null
-}
-
-pushd $(portageq portdir) >/dev/null
-run "Running cvs up" "cvs -Q up"
-popd >/dev/null
-einfo "Updating overlays"
-for x in $(portageq portdir_overlay); do
-	update_overlay "$x"
-done
-run "Regenerating cache" "egencache --update --jobs=4"
-run "Cleaning distfiles" "eclean-dist -q"
-run "Cleaning packages" "eclean-pkg -q"
-run "Regenerating use.local.desc" "egencache --update-use-local-desc"
-cp /var/cache/eix /tmp/eix-cache.old
-run "Updating eix cache" "eix-update --quiet"
-eix-diff /tmp/eix-cache.old
-rm /tmp/eix-cache.old
-einfo "Sync complete!"

[gentoo-commits] dev/angelos:master commit in: scripts/

[Christoph Mende]

commit:     3c25a23c6cbfb9aa22e2042cc705e28533407e00
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  1 20:46:32 2012 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Sun Jul  1 20:46:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=3c25a23c

Use --rbind for /dev in mount-chroot.sh

---
 scripts/mount-chroot.sh |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/scripts/mount-chroot.sh b/scripts/mount-chroot.sh
index ad419c7..8994aa8 100755
--- a/scripts/mount-chroot.sh
+++ b/scripts/mount-chroot.sh
@@ -18,8 +18,7 @@ fi
 : ${DISTDIR="$(portageq envvar DISTDIR)"}
 : ${PKGDIR="$(portageq envvar PKGDIR)"}
 
-mount --bind /dev "$@"/dev
-mount --bind /dev/pts "$@"/dev/pts
+mount --rbind /dev "$@"/dev
 mount --bind /sys "$@"/sys
 mkdir -p "$@"/usr/portage
 mount --bind "${PORTDIR}" "$@"/usr/portage

[gentoo-commits] dev/angelos:master commit in: scripts/

[Christoph Mende]

commit:     56735c9206d46aa3c2601dba735e7a3644b8727c
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 20 11:16:45 2012 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Fri Jul 20 11:16:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=56735c92

commit-xfce-sync: Tell the user we're done

---
 scripts/commit-xfce-sync.sh |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/scripts/commit-xfce-sync.sh b/scripts/commit-xfce-sync.sh
index d4e7ab6..6d503a8 100755
--- a/scripts/commit-xfce-sync.sh
+++ b/scripts/commit-xfce-sync.sh
@@ -13,3 +13,5 @@ for i in ${pkgs}; do
 	popd >/dev/null
 done
 popd >/dev/null
+
+echo "Everything committed, don't forget to push!"

[gentoo-commits] dev/angelos:master commit in: scripts/

[Christoph Mende]

commit:     7d306b209c56d52769f709e06311970c2c814ef1
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 10:40:19 2013 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 10:40:19 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=7d306b20

sync-xfce-overlay,commit-xfce-sync: Support other overlays

---
 scripts/commit-xfce-sync.sh  |    5 ++++-
 scripts/sync-xfce-overlay.sh |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/commit-xfce-sync.sh b/scripts/commit-xfce-sync.sh
index 6d503a8..8d087fc 100755
--- a/scripts/commit-xfce-sync.sh
+++ b/scripts/commit-xfce-sync.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
-OVERLAY="$(portageq get_repo_path / xfce-dev)"
+repo_name="xfce-dev"
+[ $# -gt 0 ] && repo_name=$1
+OVERLAY="$(portageq get_repo_path / ${repo_name})"
+[ $? -eq 0 ] || exit 1
 
 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 91c5a9e..968e51e 100755
--- a/scripts/sync-xfce-overlay.sh
+++ b/scripts/sync-xfce-overlay.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 
-OVERLAY="$(portageq get_repo_path / xfce-dev)"
+repo_name="xfce-dev"
+[ $# -gt 0 ] && repo_name=$1
+OVERLAY="$(portageq get_repo_path / ${repo_name})"
+[ $? -eq 0 ] || exit 1
 PORTDIR="$(portageq portdir)"
 
 # collect ebuilds

[gentoo-commits] dev/angelos:master commit in: scripts/

[Christoph Mende]

commit:     0a142e904dfad15121b64c90aafc67e7e9ee375a
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 22 11:07:48 2015 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 11:07:48 2015 +0000
URL:        https://gitweb.gentoo.org/dev/angelos.git/commit/?id=0a142e90

Update sync-xfce-overlay.sh

 scripts/sync-xfce-overlay.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/sync-xfce-overlay.sh b/scripts/sync-xfce-overlay.sh
index 968e51e..f83fa7d 100755
--- a/scripts/sync-xfce-overlay.sh
+++ b/scripts/sync-xfce-overlay.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 repo_name="xfce-dev"
-[ $# -gt 0 ] && repo_name=$1
+[[ $# -gt 0 ]] && repo_name=$1
 OVERLAY="$(portageq get_repo_path / ${repo_name})"
-[ $? -eq 0 ] || exit 1
-PORTDIR="$(portageq portdir)"
+[[ $? -eq 0 ]] || exit 1
+PORTDIR="$(portageq get_repo_path / gentoo)"
 
 # collect ebuilds
 pushd "${OVERLAY}" >/dev/null
@@ -27,9 +27,10 @@ for i in ${pkgs}; do
 
 	# get destination ebuild's header
 	dst=${OVERLAY}/${i}
+	[[ -e ${dst} ]] || continue
 	dstheader=$(grep "^# \$Header: " ${dst})
 
-	if [ "${srcheader}" != "${dstheader}" ]; then
+	if [[ "${srcheader}" != "${dstheader}" ]]; then
 		# copy new ebuild
 		cp -f ${src} ${dst}
 
@@ -43,7 +44,7 @@ for i in ${pkgs}; do
 	fi
 done
 
-if [ ${changes} -gt 0 ]; then
+if [[ ${changes} -gt 0 ]]; then
 	echo ${changes} ebuilds synced, please review the changes
 else
 	echo Everything up to date