Skip to content

Commit

Permalink
bldr-build and studio improvements
Browse files Browse the repository at this point in the history
When writing the SHA256 checksums to the manifest, files that have
spaces in the names are not escaped/quoted, so errors will get
displayed and those files will not be included in the manifest. Adding
the `-print0` option to find, along with the `-0` option to xargs
resolves this problem.

We love colorized prompts. However, in most of our default terminal
settings the escape codes cause weird behavior that prevents the
terminal from displaying really long commands. For now, let's just
have a simple prompt with no color.
  • Loading branch information
jtimberman committed Mar 16, 2016
1 parent 41aaecc commit e56777a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
2 changes: 1 addition & 1 deletion plans/bldr-build
Original file line number Diff line number Diff line change
Expand Up @@ -1879,7 +1879,7 @@ $(cat $PLAN_CONTEXT/plan.sh)
Files
-----
$(find $pkg_path -type f | $_sort_cmd | xargs $_shasum_cmd)
$(find $pkg_path -type f -print0 | $_sort_cmd | xargs -0 $_shasum_cmd)
EOT
return 0
}
Expand Down
11 changes: 2 additions & 9 deletions plans/bldr-studio/bin/studio
Original file line number Diff line number Diff line change
Expand Up @@ -332,15 +332,8 @@ EOF
# Invoke the type's implementation
finish_setup

# Add a useful command prompt
case "${TERM:-}" in
*term | xterm-* | rxvt | screen | screen-*)
prompt='\[\e[0;32m\][\[\e[0;36m\]\#\[\e[0;32m\]]['$studio_type':\[\e[0;35m\]\w\[\e[0;32m\]:\e[1;37m\$?\[\e[0;32m\]]\$\[\e[0m\]\040 '
;;
*)
prompt='[\#]['$studio_type':\w:\$?]\$\040 '
;;
esac
# This prompt tells us what kind of studio we're in!
prompt='[\#]['$studio_type':\w:\$?]\$\040 '
studio_enter_environment="$studio_enter_environment PS1=$prompt"

# Add a Studio configuration file at the root of the filesystem
Expand Down

1 comment on commit e56777a

@chef-delivery
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delivery Status:

Verify Build Acceptance
<a href='https://delivery.chef.co/e/chef/#/organizations/bldr/projects/bldr/changes/2c7b4b69-ec1e-44e7-9f51-79e6fc8cb06c/status/verify', target='_blank'><img src='https://img.shields.io/badge/Unit-Passed-brightgreen.svg', alt='Unit'> <a href='https://delivery.chef.co/e/chef/#/organizations/bldr/projects/bldr/changes/2c7b4b69-ec1e-44e7-9f51-79e6fc8cb06c/status/build', target='_blank'><img src='https://img.shields.io/badge/Unit-Passed-brightgreen.svg', alt='Unit'> <a href='https://delivery.chef.co/e/chef/#/organizations/bldr/projects/bldr/changes/2c7b4b69-ec1e-44e7-9f51-79e6fc8cb06c/status/acceptance', target='_blank'><img src='https://img.shields.io/badge/Provision-Passed-brightgreen.svg', alt='Provision'>
<a href='https://delivery.chef.co/e/chef/#/organizations/bldr/projects/bldr/changes/2c7b4b69-ec1e-44e7-9f51-79e6fc8cb06c/status/verify', target='_blank'><img src='https://img.shields.io/badge/Lint-Passed-brightgreen.svg', alt='Lint'> <a href='https://delivery.chef.co/e/chef/#/organizations/bldr/projects/bldr/changes/2c7b4b69-ec1e-44e7-9f51-79e6fc8cb06c/status/build', target='_blank'><img src='https://img.shields.io/badge/Lint-Passed-brightgreen.svg', alt='Lint'> <a href='https://delivery.chef.co/e/chef/#/organizations/bldr/projects/bldr/changes/2c7b4b69-ec1e-44e7-9f51-79e6fc8cb06c/status/acceptance', target='_blank'><img src='https://img.shields.io/badge/Deploy-Skipped-lightgrey.svg', alt='Deploy'>
<a href='https://delivery.chef.co/e/chef/#/organizations/bldr/projects/bldr/changes/2c7b4b69-ec1e-44e7-9f51-79e6fc8cb06c/status/verify', target='_blank'><img src='https://img.shields.io/badge/Syntax-Skipped-lightgrey.svg', alt='Syntax'> <a href='https://delivery.chef.co/e/chef/#/organizations/bldr/projects/bldr/changes/2c7b4b69-ec1e-44e7-9f51-79e6fc8cb06c/status/build', target='_blank'><img src='https://img.shields.io/badge/Syntax-Skipped-lightgrey.svg', alt='Syntax'> <a href='https://delivery.chef.co/e/chef/#/organizations/bldr/projects/bldr/changes/2c7b4b69-ec1e-44e7-9f51-79e6fc8cb06c/status/acceptance', target='_blank'><img src='https://img.shields.io/badge/Smoke-Skipped-lightgrey.svg', alt='Smoke'>
<a href='https://delivery.chef.co/e/chef/#/organizations/bldr/projects/bldr/changes/2c7b4b69-ec1e-44e7-9f51-79e6fc8cb06c/status/build', target='_blank'><img src='https://img.shields.io/badge/Quality-Skipped-lightgrey.svg', alt='Quality'> <a href='https://delivery.chef.co/e/chef/#/organizations/bldr/projects/bldr/changes/2c7b4b69-ec1e-44e7-9f51-79e6fc8cb06c/status/acceptance', target='_blank'><img src='https://img.shields.io/badge/Functional-Passed-brightgreen.svg', alt='Functional'>
<a href='https://delivery.chef.co/e/chef/#/organizations/bldr/projects/bldr/changes/2c7b4b69-ec1e-44e7-9f51-79e6fc8cb06c/status/build', target='_blank'><img src='https://img.shields.io/badge/Security-Skipped-lightgrey.svg', alt='Security'>
<a href='https://delivery.chef.co/e/chef/#/organizations/bldr/projects/bldr/changes/2c7b4b69-ec1e-44e7-9f51-79e6fc8cb06c/status/build', target='_blank'><img src='https://img.shields.io/badge/Publish-Skipped-lightgrey.svg', alt='Publish'>

Please sign in to comment.