From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-496482-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 085B91381F4
	for <garchives@archives.gentoo.org>; Thu, 16 Aug 2012 18:45:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id B6A65E0509;
	Thu, 16 Aug 2012 18:45:49 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 83B39E0509
	for <gentoo-commits@lists.gentoo.org>; Thu, 16 Aug 2012 18:45:49 +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 E8E511B4035
	for <gentoo-commits@lists.gentoo.org>; Thu, 16 Aug 2012 18:45:48 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id A9080E543A
	for <gentoo-commits@lists.gentoo.org>; Thu, 16 Aug 2012 18:45:47 +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: <1345142723.c8703354e36d85468e4b336371be424b76a68726.robbat2@OpenRC>
Subject: [gentoo-commits] proj/openrc:master commit in: sh/
X-VCS-Repository: proj/openrc
X-VCS-Files: sh/tmpfiles.sh.in
X-VCS-Directories: sh/
X-VCS-Committer: robbat2
X-VCS-Committer-Name: Robin H. Johnson
X-VCS-Revision: c8703354e36d85468e4b336371be424b76a68726
X-VCS-Branch: master
Date: Thu, 16 Aug 2012 18:45:47 +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: bee579d7-9ecb-41bd-8619-ce93974bfe32
X-Archives-Hash: 438504ebe03e6e0c75cd34c73fcea12f

commit:     c8703354e36d85468e4b336371be424b76a68726
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 16 18:44:47 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Aug 16 18:45:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=c8703354

sh/tmpfiles: fix quoting for optional arguments

Some optional arguments were missing quotes in the tests, so produced
spurious warnings.

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

---
 sh/tmpfiles.sh.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sh/tmpfiles.sh.in b/sh/tmpfiles.sh.in
index de81964..1460bdf 100755
--- a/sh/tmpfiles.sh.in
+++ b/sh/tmpfiles.sh.in
@@ -268,10 +268,10 @@ for FILE in $tmpfiles_d ; do
 		age=$6
 		arg=$7
 
-		[ ${4} = '-' ] && uid=0
-		[ ${5} = '-' ] && gid=0
-		[ ${6} = '-' ] && age=0
-		[ ${7} = '-' ] && arg=''
+		[ "${4}" = '-' -o "${4}" = '' ] && uid=0
+		[ "${5}" = '-' -o "${5}" = '' ] && gid=0
+		[ "${6}" = '-' -o "${6}" = '' ] && age=0
+		[ "${7}" = '-' -o "${7}" = '' ] && arg=''
 		set -- "$path" "$mode" "$uid" "$gid" "$age" "$arg"
 
 		[ "$VERBOSE" -eq "1" ] && echo _$cmd "$@"