From 6859e808bd86d38df9cc16a23452ba0cb8cb6339 Mon Sep 17 00:00:00 2001 From: Wang Shilong Date: Fri, 1 Nov 2019 16:03:07 +0800 Subject: [PATCH] EX-687 build: fix to generate lustre version on ubuntu Problem is dash doesn't support >& operaton and will report as Syntax error: Bad fd number. Test-parameters: trivial Signed-off-by: Wang Shilong Change-Id: Iafc95756c4981798fe68dd4c51e2d6418335b7dd Reviewed-on: https://review.whamcloud.com/41831 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- LUSTRE-VERSION-GEN | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/LUSTRE-VERSION-GEN b/LUSTRE-VERSION-GEN index 80d0c9e..a85286e 100755 --- a/LUSTRE-VERSION-GEN +++ b/LUSTRE-VERSION-GEN @@ -34,8 +34,10 @@ else VC=unset fi [ -z $S_VN ] && S_VN=$(echo $VN | awk -F '_' '{print $1}') -echo $VN | grep ddn >&/dev/null || - VN=$(echo "$VN" | sed -s "s#${S_VN}#${S_VN}_${DDN_VERSION}#") +echo $VN | grep ddn 1>/dev/null +if [ $? -ne 0 ]; then + VN=$(echo "$VN" | sed -s "s#${S_VN}#${S_VN}_${DDN_VERSION}#") +fi test "$VN" = "$VC" || { echo "LUSTRE_VERSION = $VN" >$LVF } -- 1.8.3.1