All of lore.kernel.org
 help / color / mirror / Atom feed
From: Joshua Lock <joshua.g.lock@linux.intel.com>
To: Bill Randle <william.c.randle@intel.com>, yocto@yoctoproject.org
Subject: Re: [yocto-autobuilder][PATCH] PublishArtifacts.py: fix file check to work under dash
Date: Mon, 22 Aug 2016 11:28:05 +0100	[thread overview]
Message-ID: <1471861685.5256.11.camel@linux.intel.com> (raw)
In-Reply-To: <1471733421-27188-1-git-send-email-william.c.randle@intel.com>

On Sat, 2016-08-20 at 15:50 -0700, Bill Randle wrote:
> An earlier patch (ed3857990) to check for existing msd5sum files
> worked
> fine when tested under bash, but failed with an error message about
> [[
> not found when run under dash. Updated the test to not rely on
> bashisms.
> 
> Signed-off-by: Bill Randle <william.c.randle@intel.com>
> ---
>  lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishArtifacts.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishArtifacts.py
> b/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishArtifacts.py
> index d8b554f..58048f0 100644
> --- a/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishArtifacts.py
> +++ b/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishArtifacts.py
> @@ -259,8 +259,9 @@ class PublishArtifacts(ShellCommand):
>      def generateMD5cmd(self, artifact, deploy_dir):
>          cmd = ""
>          if os.environ.get('GEN_IMG_MD5') == "True":
> +            # crufty test for existing md5sum file required for dash
> shell
>              cmd += "for x in `find " + deploy_dir + " -maxdepth 5
> -type f`;"
> -            cmd += "do if [[ $x != *.md5sum ]]; then md5sum $x >> "
> + "$x.md5sum; fi; done;"
> +            cmd += "do echo ${x} | grep -q '\.md5sum'; if [ $? -ne 0
> ]; then md5sum $x >> " + "$x.md5sum; fi; done;"
>          return cmd

Rather than a "crufty" test, how about using POSIX sh parameter
expansion, i.e.

$ foo="blah.bar"
$ if [ ${foo##*.} == bar ]; then echo "bar!"; fi
bar!

Therefore, the patch would be something like (untested):

cmd += "if [ ${x##*.} == .md5sum ]; then md5sum $x >> $x.md5sum; fi"

Regards,

Joshua

>  
>      def getDeployNames(self, artifact, buildername):


  reply	other threads:[~2016-08-22 10:28 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-20 22:50 [yocto-autobuilder][PATCH] PublishArtifacts.py: fix file check to work under dash Bill Randle
2016-08-22 10:28 ` Joshua Lock [this message]
2016-08-22 14:40   ` Randle, William C

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1471861685.5256.11.camel@linux.intel.com \
    --to=joshua.g.lock@linux.intel.com \
    --cc=william.c.randle@intel.com \
    --cc=yocto@yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.