diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2014-10-24 17:30:54 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2014-10-27 11:01:26 -0700 |
| commit | febfbc98572af4eba90ed90b2f8a65a8a2616311 (patch) | |
| tree | 65ec69011907319c48572cf6c91ba09aa4d693b2 /images | |
| parent | b9303d85e241220eea3d57b181971e34a7e68d5f (diff) | |
| download | uhd-febfbc98572af4eba90ed90b2f8a65a8a2616311.tar.gz uhd-febfbc98572af4eba90ed90b2f8a65a8a2616311.tar.bz2 uhd-febfbc98572af4eba90ed90b2f8a65a8a2616311.zip | |
utils: Minor fixes in images downloader and packaging scripts
Diffstat (limited to 'images')
| -rwxr-xr-x | images/create_imgs_package.py | 2 | ||||
| -rwxr-xr-x | images/make_zip.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/images/create_imgs_package.py b/images/create_imgs_package.py index 642edaebb..4b49390ce 100755 --- a/images/create_imgs_package.py +++ b/images/create_imgs_package.py @@ -38,7 +38,7 @@ def clear_img_dir(img_root_dir): def get_zipfilename_from_cpack_output(cpoutput): """ Parses the output of the ZIP-file creating script and scrapes the actual file name. """ - regex = re.compile("\/build\/(?P<filename>.*\.zip)") + regex = re.compile("\/build\/(?P<filename>[^\/]+\.zip)") results = regex.search(cpoutput) return results.group('filename') diff --git a/images/make_zip.sh b/images/make_zip.sh index 0c59238a0..b2e9645ef 100755 --- a/images/make_zip.sh +++ b/images/make_zip.sh @@ -18,7 +18,7 @@ fi if [ -e "images/LICENSE" ]; then rm images/LICENSE fi -TAGFILES=`ls images/*.tag` +TAGFILES=`ls images/*.tag 2>/dev/null` if [ -n "$TAGFILES" ]; then rm $TAGFILES fi |