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 1SdE9G-0002cV-Lo for garchives@archives.gentoo.org; Sat, 09 Jun 2012 05:23:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9FE38E065E; Sat, 9 Jun 2012 05:23:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 67DA3E065E for ; Sat, 9 Jun 2012 05:23:35 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9FEA11B4011 for ; Sat, 9 Jun 2012 05:23:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BDF3BE5432 for ; Sat, 9 Jun 2012 05:23:32 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1339012210.3cff43d89ac830b430620aaa640ae616e7902a49.vapier@gentoo> Subject: [gentoo-commits] proj/crossdev:master commit in: / X-VCS-Repository: proj/crossdev X-VCS-Files: crossdev X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 3cff43d89ac830b430620aaa640ae616e7902a49 X-VCS-Branch: master Date: Sat, 9 Jun 2012 05:23:32 +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: e099f020-d782-4ec3-8b7d-34d86a503882 X-Archives-Hash: 108778363c59e9181b0db2070e376033 commit: 3cff43d89ac830b430620aaa640ae616e7902a49 Author: Mike Frysinger gentoo org> AuthorDate: Wed Jun 6 19:50:10 2012 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Wed Jun 6 19:50:10 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/crossdev.git;= a=3Dcommit;h=3D3cff43d8 crossdev: delay uninstalling to after parsing options This makes command lines like `crossdev -C foo --help` work. Signed-off-by: Mike Frysinger gentoo.org> --- crossdev | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/crossdev b/crossdev index 468c3b1..7073ab6 100755 --- a/crossdev +++ b/crossdev @@ -386,8 +386,6 @@ uninstall() { fi fi done - - exit 0 } =20 set_withval() { @@ -481,6 +479,7 @@ EX_GCC=3D"no" EX_GDB=3D"no" FORCE=3D"no" SET_X=3D"no" +ACTION=3D"install" SHOW_FAIL_LOG=3D"no" SHOW_TARGET_CFG=3D"no" INIT_TARGET_ONLY=3D"no" @@ -508,7 +507,7 @@ while [[ $# -gt 0 ]] ; do -A|--abis) shift; MULTILIB_ABIS=3D$1;; --host-abi) shift; HOST_ABI=3D$1;; -S|--stable) DEFAULT_VER=3D"[stable]";; - -C|--clean) shift; parse_target $1; uninstall;; + -C|--clean) shift; parse_target $1; ACTION=3D"uninstall";; -s?|--stage?) STAGE=3D${1:0-1};; -oS|--overlays) shift; SEARCH_OVERLAYS=3D$1;; -oO|--ov-output) shift; CROSSDEV_OVERLAY=3D$1;; @@ -532,6 +531,9 @@ while [[ $# -gt 0 ]] ; do shift done [[ ${SET_X} =3D=3D "yes" ]] && set -x +case ${ACTION} in +uninstall) uninstall; exit 0;; +esac =20 BVER=3D${BVER:-${DEFAULT_VER}} GVER=3D${GVER:-${DEFAULT_VER}}