From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1030536-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 113A9138334
for <garchives@archives.gentoo.org>; Fri, 15 Jun 2018 22:45:42 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D14E6E07EF;
Fri, 15 Jun 2018 22:45:40 +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 A7D4BE07EF
for <gentoo-commits@lists.gentoo.org>; Fri, 15 Jun 2018 22:45:40 +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 801D2335C7F
for <gentoo-commits@lists.gentoo.org>; Fri, 15 Jun 2018 22:45:38 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C848D2D5
for <gentoo-commits@lists.gentoo.org>; Fri, 15 Jun 2018 22:45:36 +0000 (UTC)
From: "William Hubbs" <williamh@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, "William Hubbs" <williamh@gentoo.org>
Message-ID: <1529102679.a097933edab9d7221df1831e098415d604437c98.williamh@OpenRC>
Subject: [gentoo-commits] proj/openrc:master commit in: sh/
X-VCS-Repository: proj/openrc
X-VCS-Files: sh/start-stop-daemon.sh
X-VCS-Directories: sh/
X-VCS-Committer: williamh
X-VCS-Committer-Name: William Hubbs
X-VCS-Revision: a097933edab9d7221df1831e098415d604437c98
X-VCS-Branch: master
Date: Fri, 15 Jun 2018 22:45:36 +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: 5dd7d447-4fe6-4ae6-b3d3-a0d163d6fbd9
X-Archives-Hash: a4e1293abb914e249467dd332e502632
commit: a097933edab9d7221df1831e098415d604437c98
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Jun 15 22:44:39 2018 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jun 15 22:44:39 2018 +0000
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=a097933e
sh/start-stop-daemon.sh: fix processing of the logger arguments
sh/start-stop-daemon.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/sh/start-stop-daemon.sh b/sh/start-stop-daemon.sh
index 69666ff7..e68b47ef 100644
--- a/sh/start-stop-daemon.sh
+++ b/sh/start-stop-daemon.sh
@@ -38,6 +38,10 @@ ssd_start()
service_inactive && _inactive=true
mark_service_inactive
fi
+ [ -n "$output_logger" ] &&
+ output_logger_arg="--stdout-logger \"$output_logger\""
+ [ -n "$error_logger" ] &&
+ error_logger_arg="--stderr-logger \"$error_logger\""
#the eval call is necessary for cases like:
# command_args="this \"is a\" test"
# to work properly.
@@ -47,8 +51,8 @@ ssd_start()
${directory:+--chdir} $directory \
${output_log+--stdout} $output_log \
${error_log+--stderr} $error_log \
- ${output_logger+--stdout-logger} \"$output_logger\" \
- ${error_logger+--stderr-logger} \"$error_logger\" \
+ ${output_logger_arg} \
+ ${error_logger_arg} \
${procname:+--name} $procname \
${pidfile:+--pidfile} $pidfile \
${command_user+--user} $command_user \