From owner-svn-src-user@FreeBSD.ORG  Tue May 28 09:51:28 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 6E5FE9EC;
 Tue, 28 May 2013 09:51:28 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 613A78B7;
 Tue, 28 May 2013 09:51:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4S9pRt4012797;
 Tue, 28 May 2013 09:51:27 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4S9pRxv012796;
 Tue, 28 May 2013 09:51:27 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201305280951.r4S9pRxv012796@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Tue, 28 May 2013 09:51:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r251057 - user/des/zfs-backup
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 May 2013 09:51:28 -0000

Author: des
Date: Tue May 28 09:51:27 2013
New Revision: 251057
URL: http://svnweb.freebsd.org/changeset/base/251057

Log:
  A missing $ caused the script to look in the wrong place when trying
  to determine whether this was a first or subsequent run - but only
  when backing up a non-root dataset.
  
  Also, use [ -t 0 ] instead of tty(1).

Modified:
  user/des/zfs-backup/zfs-backup.sh

Modified: user/des/zfs-backup/zfs-backup.sh
==============================================================================
--- user/des/zfs-backup/zfs-backup.sh	Tue May 28 09:33:46 2013	(r251056)
+++ user/des/zfs-backup/zfs-backup.sh	Tue May 28 09:51:27 2013	(r251057)
@@ -86,13 +86,13 @@ fi
 if [ "${fqsrc#$fqdst/}" != "$fqsrc" -o "${fqdst#$fqsrc/}" != "$fqdst" ] ; then
 	error "source and destination must be non-overlapping datasets"
 fi
-case src in
+case "$src" in
 */*)
 	sub="/${src#*/}"
 	;;
 esac
 
-if tty >/dev/null ; then
+if [ -t 0 ] ; then
 	verbose="-v"
 fi