From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EA88A1389E2 for ; Mon, 24 Nov 2014 10:15:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 834A3E09ED; Mon, 24 Nov 2014 10:15:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BD779E09ED for ; Mon, 24 Nov 2014 10:15:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AB83D340552 for ; Mon, 24 Nov 2014 10:15:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58045ACCB for ; Mon, 24 Nov 2014 10:15:20 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1416824109.88326fb9c8a25da67709418ca5f328261defce23.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: gentoo/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: gentoo/release-prepare.sh X-VCS-Directories: gentoo/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 88326fb9c8a25da67709418ca5f328261defce23 X-VCS-Branch: master Date: Mon, 24 Nov 2014 10:15:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c9a00e0f-db2c-4673-9baa-3f71ad23f139 X-Archives-Hash: cb0872eb8ffa74ed4d39b89d6a03332f commit: 88326fb9c8a25da67709418ca5f328261defce23 Author: Jason Zaman perfinion com> AuthorDate: Mon Nov 24 10:12:14 2014 +0000 Commit: Jason Zaman perfinion com> CommitDate: Mon Nov 24 10:15:09 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=88326fb9 make the gentoo release script a little more user-agnostic --- gentoo/release-prepare.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gentoo/release-prepare.sh b/gentoo/release-prepare.sh index 073ff58..afeed8f 100644 --- a/gentoo/release-prepare.sh +++ b/gentoo/release-prepare.sh @@ -7,7 +7,8 @@ TRANSLATE="s:\(${HARDENEDREFPOL}\|${REFPOLRELEASE}\):refpolicy/:g"; NEWVERSION="${1}"; -REMOTELOCATION="swift@dev.gentoo.org:public_html/patches/selinux-base-policy"; +# If remote requires a different username, it should be set in ~/.ssh/config +REMOTELOCATION="dev.gentoo.org:/home/swift/public_html/patches/selinux-base-policy"; usage() { echo "Usage: $0 "; @@ -20,12 +21,12 @@ usage() { echo "The following environment variables must be declared correctly for the script"; echo "to function properly:"; echo " - GENTOOX86 should point to the gentoo-x86 checkout"; - echo " E.g. export GENTOOX86=\"/home/user/dev/gentoo-x86\""; + echo " E.g. export GENTOOX86=\"/home/user/dev/gentoo-x86/\""; echo " - HARDENEDREFPOL should point to the hardened-refpolicy.git checkout"; - echo " E.g. export HARDENEDREFPOL=\"/home/user/dev/hardened-refpolicy\""; + echo " E.g. export HARDENEDREFPOL=\"/home/user/dev/hardened-refpolicy/\""; echo " - REFPOLRELEASE should point to the current latest /release/ of the reference" echo " policy (so NOT to a checkout), extracted somewhere on the file system." - echo " E.g. export REFPOLRELEASE=\"/home/user/local/refpolicy-20130424\""; + echo " E.g. export REFPOLRELEASE=\"/home/user/local/refpolicy-20130424/\""; } assertDirEnvVar() { @@ -98,7 +99,7 @@ tagRelease() { printf "Creating tag ${NEWVERSION} in our repository... "; cd ${HARDENEDREFPOL}; git tag -a ${NEWVERSION} -m "Release set of ${NEWVERSION}" > /dev/null 2>&1 || die "Failed to create tag"; - git push origin ${NEWVERSION} > /dev/null 2>&1 || die "Faield to push tag to origin repository"; + git push origin ${NEWVERSION} > /dev/null 2>&1 || die "Failed to push tag to origin repository"; printf "done\n"; };