From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Sun, 12 May 2024 15:17:36 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1s6956-00AvxP-0Z for lore@lore.pengutronix.de; Sun, 12 May 2024 15:17:36 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1s6955-0004HP-Qr; Sun, 12 May 2024 15:17:35 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1s694D-0002gH-MA; Sun, 12 May 2024 15:16:41 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1s694D-000zYS-9t; Sun, 12 May 2024 15:16:41 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1s694D-00FXTd-0q; Sun, 12 May 2024 15:16:41 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Sun, 12 May 2024 15:16:41 +0200 Message-Id: <20240512131641.3703598-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240506105051.323546-2-ada@thorsis.com> References: <20240506105051.323546-2-ada@thorsis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] ptxd_make_world_inject: Remove useless test X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Alexander Dahl Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 33fa14b8b788e2d57d015c91c4c758708824a05d. Michael [sent from post-receive hook] On Sun, 12 May 2024 15:16:41 +0200, Alexander Dahl wrote: > One line above $target is set to "${var}/$(subshell)" and even if $var > _and_ the result of the subshell call is empty, there's still the slash. > Thus target is never empty. > > Signed-off-by: Alexander Dahl > Acked-by: Michael Riesch > Message-Id: <20240506105051.323546-2-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > diff --git a/scripts/lib/ptxd_make_world_inject.sh b/scripts/lib/ptxd_make_world_inject.sh > index fe4eb8363619..5c2d0dc5fb3e 100644 > --- a/scripts/lib/ptxd_make_world_inject.sh > +++ b/scripts/lib/ptxd_make_world_inject.sh > @@ -11,9 +11,6 @@ ptxd_make_inject() { > > source="$(echo ${inject_file} | cut -d ":" -f 1)" > target="${pkg_source}/$(echo ${inject_file} | cut -d ":" -f 2)" > - if [ -z "${target}" ]; then > - target="${source}" > - fi > > if [[ "${source}" =~ ^/.* ]]; then > ptxd_bailout "'${source}' must not be an absolute path!" \