Skip to content

Commit

Permalink
Fix build_lib.sh to handle spaces in names
Browse files Browse the repository at this point in the history
  • Loading branch information
galthaus committed Oct 20, 2011
1 parent 667386b commit 49db6ce
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions build_lib.sh
Expand Up @@ -22,8 +22,9 @@ get_barclamp_info() {
local bc yml_file line query newdeps dep d i
local new_barclamps=()
# Pull in interesting information from all our barclamps
for bc in $CROWBAR_DIR/barclamps/*; do
[[ -d $bc ]] || continue
cd "$CROWBAR_DIR"
for bc in barclamps/*; do
[[ -d "$bc" ]] || continue
bc=${bc##*/}
debug "Reading metadata for $bc barclamp."
is_barclamp "$bc" || die "$bc is not a barclamp!"
Expand Down Expand Up @@ -57,6 +58,7 @@ get_barclamp_info() {
${BC_QUERY_STRINGS["$query"]} 2>/dev/null)
done
done
cd -

debug "Analyzing barclamp group membership"
# If any barclamps need group expansion, do it.
Expand Down Expand Up @@ -582,7 +584,7 @@ in_cache() (
)

# Check to see if something is a barclamp.
is_barclamp() { [[ -f $CROWBAR_DIR/barclamps/$1/crowbar.yml ]]; }
is_barclamp() { [[ -f "$CROWBAR_DIR/barclamps/$1/crowbar.yml" ]]; }

# Build our ISO image.
build_iso() (
Expand All @@ -606,4 +608,4 @@ test_iso() {
die "$(date '+%F %T %z'): Smoketest of $ISO_DEST/$BUILT_ISO failed."
}

CROWBAR_BUILD_SOURCED=true
CROWBAR_BUILD_SOURCED=true

0 comments on commit 49db6ce

Please sign in to comment.