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 21ED71391DB for ; Sun, 23 Mar 2014 13:25:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01F18E0ADB; Sun, 23 Mar 2014 13:25:51 +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 60AEDE0ADA for ; Sun, 23 Mar 2014 13:25:50 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5D6C033F9D2 for ; Sun, 23 Mar 2014 13:25:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id A4E2518875 for ; Sun, 23 Mar 2014 13:25:47 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1395539331.a8c3ab7ccce6f3eb43aab4722168bf4e49dd5d9b.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: / X-VCS-Repository: proj/portage X-VCS-Files: mkrelease.sh X-VCS-Directories: / X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: a8c3ab7ccce6f3eb43aab4722168bf4e49dd5d9b X-VCS-Branch: master Date: Sun, 23 Mar 2014 13:25:47 +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: a59fb649-7750-4008-a442-4c402fe869fa X-Archives-Hash: f801409ff724b6d9fb761b1de7a5ecf7 commit: a8c3ab7ccce6f3eb43aab4722168bf4e49dd5d9b Author: Brian Dolbec gentoo org> AuthorDate: Sun Mar 23 01:48:51 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sun Mar 23 01:48:51 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a8c3ab7c makerelease.sh: Add --user option for the scp upload. --- mkrelease.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/mkrelease.sh b/mkrelease.sh index 94e90f7..2410b02 100755 --- a/mkrelease.sh +++ b/mkrelease.sh @@ -9,9 +9,10 @@ USE_TAG=false CHANGELOG_REVISION= UPLOAD_LOCATION= RUNTESTS=false +USER= usage() { - echo "Usage: ${0##*/} [--changelog-rev ] [-t|--tag] [-u|--upload ] [--runtests] " + echo "Usage: ${0##*/} [--changelog-rev ] [-t|--tag] [-u|--upload ] [--user ] [--runtests] " exit ${1:-0} } @@ -20,7 +21,7 @@ die() { usage 1 } -ARGS=$(getopt -o htu: --long help,changelog-rev:,runtests,tag,upload: \ +ARGS=$(getopt -o htu: --long help,changelog-rev:,runtests,tag,upload:,user: \ -n "${0##*/}" -- "$@") [ $? != 0 ] && die "initialization error" @@ -40,6 +41,10 @@ while true; do UPLOAD_LOCATION=$2 shift 2 ;; + --user) + USER=$2"@" + shift 2 + ;; -h|--help) usage ;; @@ -127,8 +132,8 @@ if [[ -n ${DISTDIR} && -d ${DISTDIR} && -w ${DISTDIR} ]] ; then fi if [[ -n ${UPLOAD_LOCATION} ]] ; then - echo ">>> Uploading ${RELEASE_TARBALL} to ${UPLOAD_LOCATION}" - scp "${RELEASE_TARBALL}" "dev.gentoo.org:${UPLOAD_LOCATION}" || die "upload failed" + echo ">>> Uploading ${RELEASE_TARBALL} to ${USER}dev.gentoo.org:${UPLOAD_LOCATION}" + scp "${RELEASE_TARBALL}" "${USER}dev.gentoo.org:${UPLOAD_LOCATION}" || die "upload failed" else du -h "${RELEASE_TARBALL}" fi