From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-993734-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id EB349138AE9
	for <garchives@archives.gentoo.org>; Fri, 29 Dec 2017 05:32:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 31BDDE0E7A;
	Fri, 29 Dec 2017 05:32:26 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 101D9E0E7A
	for <gentoo-commits@lists.gentoo.org>; Fri, 29 Dec 2017 05:32:25 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 68E2734105A
	for <gentoo-commits@lists.gentoo.org>; Fri, 29 Dec 2017 05:32:24 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id CEC8BAEBA
	for <gentoo-commits@lists.gentoo.org>; Fri, 29 Dec 2017 05:32:20 +0000 (UTC)
From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" <robbat2@gentoo.org>
Message-ID: <1514525530.5d73c6b04ae06319ba5cc7bed9902249284494a1.robbat2@gentoo>
Subject: [gentoo-commits] proj/releng:master commit in: tools/
X-VCS-Repository: proj/releng
X-VCS-Files: tools/catalyst-auto
X-VCS-Directories: tools/
X-VCS-Committer: robbat2
X-VCS-Committer-Name: Robin H. Johnson
X-VCS-Revision: 5d73c6b04ae06319ba5cc7bed9902249284494a1
X-VCS-Branch: master
Date: Fri, 29 Dec 2017 05:32:20 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: de68eece-85e3-495c-bc72-38906620b864
X-Archives-Hash: 93fa12df72b7df2076737ee4cc9b1552

commit:     5d73c6b04ae06319ba5cc7bed9902249284494a1
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 05:32:10 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 05:32:10 2017 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=5d73c6b0

catalyst-auto: add intermediate verbose, that prints the command, but not the output; -vv has old behavior

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 tools/catalyst-auto | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index cd26f969..02115d1c 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -77,9 +77,12 @@ run_cmd() {
   local logfile="$1"
   shift
 
-  if [ $verbose = 1 ]; then
+  if [ $verbose = 2 ]; then
     echo "*** Running command: $*"
     "$@" 2>&1 | tee -a "${logfile}"
+  elif [ $verbose = 1 ]; then
+    echo "*** Running command: $*"
+    "$@" &>> "${logfile}"
   else
     "$@" &>> "${logfile}"
   fi
@@ -137,7 +140,7 @@ do
       shift
       ;;
     -v|--verbose)
-      verbose=1
+      verbose=$(($verbose+1))
       ;;
     -k|--keep-tmpdir)
       keep_tmpdir=1
@@ -224,7 +227,7 @@ if [[ ${preclean} -eq 1 ]]; then
   mkdir "${TMPDIR}"
 fi
 
-if [ ${verbose} = 1 ]; then
+if [ ${verbose} -ge 1 ]; then
   echo "TMPDIR = ${TMPDIR}"
   echo "DATESTAMP = ${DATESTAMP}"
   echo "TIMESTAMP = ${TIMESTAMP}"