From 5fa37bc13d0dc3a96f93dc93f378194826f64e47 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Tue, 19 Jan 2016 16:15:06 +0100 Subject: [PATCH] pam: fix shell tests on package install Without this change you will may able to create an image with this silent error : | Output from pam-*@*: | /*/rootfs/install/tmp/rpm-tmp.*: 4: [: x$D: unexpected operator | /*/rootfs/install/tmp/rpm-tmp.*: 5: [: -a: unexpected operator Change-Id: Idbdafd3a05309a479d00f50ab0ae62cd28ddffff Signed-off-by: Philippe Coval --- .../recipes-extended/pam/pam-extraconf.inc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/meta-tizen-common-base/recipes-extended/pam/pam-extraconf.inc b/meta-tizen-common-base/recipes-extended/pam/pam-extraconf.inc index 471c364..7ccfe07 100644 --- a/meta-tizen-common-base/recipes-extended/pam/pam-extraconf.inc +++ b/meta-tizen-common-base/recipes-extended/pam/pam-extraconf.inc @@ -106,13 +106,15 @@ do_install_append() { pkg_postinst_${PN}() { #!/bin/sh -e - [ "x\$D" == "x" ] && ldconfig - if [ ! -a $D/var/log/faillog ] ; then - mkdir -p $D/var/log - /usr/bin/install -m 600 /dev/null $D/var/log/faillog + [ "" != "$D" ] || ldconfig + + if [ ! -e "$D/var/log/faillog" ] ; then + mkdir -p "$D/var/log" + /usr/bin/install -m 600 /dev/null "$D/var/log/faillog" fi - if [ ! -a $D/var/log/tallylog ] ; then - mkdir -p $D/var/log - /usr/bin/install -m 600 /dev/null $D/var/log/tallylog + + if [ ! -e "$D/var/log/tallylog" ] ; then + mkdir -p "$D/var/log" + /usr/bin/install -m 600 /dev/null "$D/var/log/tallylog" fi } -- 2.7.4