From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QCdwX-00073B-1W for garchives@archives.gentoo.org; Wed, 20 Apr 2011 20:24:09 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13C631C02C; Wed, 20 Apr 2011 20:24:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D15DA1C02C for ; Wed, 20 Apr 2011 20:24:01 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 482851B4044 for ; Wed, 20 Apr 2011 20:24:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 021AA80296 for ; Wed, 20 Apr 2011 20:24:00 +0000 (UTC) From: "Christoph Mende" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Mende" Message-ID: <254f145951c7ddefd78b21cf4d4eb917ca9410d1.angelos@gentoo> Subject: [gentoo-commits] dev/angelos:master commit in: scripts/ X-VCS-Repository: dev/angelos X-VCS-Files: scripts/commit-xfce-sync.sh scripts/sync-xfce-overlay.sh scripts/sync.sh X-VCS-Directories: scripts/ X-VCS-Committer: angelos X-VCS-Committer-Name: Christoph Mende X-VCS-Revision: 254f145951c7ddefd78b21cf4d4eb917ca9410d1 Date: Wed, 20 Apr 2011 20:24:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: e0c59a4cd7232fc010a02073363e52e4 commit: 254f145951c7ddefd78b21cf4d4eb917ca9410d1 Author: Christoph Mende gentoo org> AuthorDate: Wed Apr 20 20:23:49 2011 +0000 Commit: Christoph Mende gentoo org> CommitDate: Wed Apr 20 20:23:49 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/angelos.git;a=3D= commit;h=3D254f1459 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 =20 -OVERLAY=3D/home/angelos/overlays/xfce +: ${OVERLAY=3D/home/angelos/overlays/xfce} =20 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 =20 -OVERLAY=3D"${HOME}/overlays/xfce" -PORTDIR=3D"${HOME}/gentoo-x86" +: ${OVERLAY=3D${HOME}/overlays/xfce" =20 # collect ebuilds pushd "${OVERLAY}" >/dev/null @@ -9,6 +8,7 @@ pkgs=3D$(echo */*/*.ebuild) popd >/dev/null =20 changes=3D0 +PORTDIR=3D$(portageq portdir) =20 for i in ${pkgs}; do # get cat/pkg @@ -23,8 +23,7 @@ for i in ${pkgs}; do srcheader=3D$(grep "^# \$Header: " ${src}) =20 # get destination ebuild's header - dst=3D"${OVERLAY}"/${CAT}/${PN}/${PN}-9999.ebuild - dst=3D"${OVERLAY}"/${i} + dst=3D${OVERLAY}/${i} dstheader=3D$(grep "^# \$Header: " ${dst}) =20 if [ "${srcheader}" !=3D "${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 } =20 -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"