Skip to content

Commit 343d84b

Browse files
author
Matthew Fisher
committed
style(builder): convert tabs to spaces
1 parent d4e45ce commit 343d84b

1 file changed

Lines changed: 43 additions & 44 deletions

File tree

  • builder/image/slugbuilder/builder

builder/image/slugbuilder/builder/build.sh

Lines changed: 43 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ set -eo pipefail
33

44

55
if [[ "$1" == "-" ]]; then
6-
slug_file="$1"
6+
slug_file="$1"
77
else
8-
slug_file=/tmp/slug.tgz
9-
if [[ "$1" ]]; then
10-
put_url="$1"
11-
fi
8+
slug_file=/tmp/slug.tgz
9+
if [[ "$1" ]]; then
10+
put_url="$1"
11+
fi
1212
fi
1313

1414

@@ -23,37 +23,36 @@ mkdir -p $buildpack_root
2323
mkdir -p $build_root/.profile.d
2424

2525
function output_redirect() {
26-
if [[ "$slug_file" == "-" ]]; then
27-
cat - 1>&2
28-
else
29-
cat -
30-
fi
26+
if [[ "$slug_file" == "-" ]]; then
27+
cat - 1>&2
28+
else
29+
cat -
30+
fi
3131
}
3232

3333
function echo_title() {
34-
echo $'\e[1G----->' $* | output_redirect
34+
echo $'\e[1G----->' $* | output_redirect
3535
}
3636

3737
function echo_normal() {
38-
echo $'\e[1G ' $* | output_redirect
38+
echo $'\e[1G ' $* | output_redirect
3939
}
4040

4141
function ensure_indent() {
42-
while read line; do
43-
if [[ "$line" == --* ]]; then
44-
echo $'\e[1G'$line | output_redirect
45-
else
46-
echo $'\e[1G ' "$line" | output_redirect
47-
fi
48-
49-
done
42+
while read line; do
43+
if [[ "$line" == --* ]]; then
44+
echo $'\e[1G'$line | output_redirect
45+
else
46+
echo $'\e[1G ' "$line" | output_redirect
47+
fi
48+
done
5049
}
5150

5251
## Copy application code over
5352
if [ -d "/tmp/app" ]; then
54-
cp -rf /tmp/app/. $app_dir
53+
cp -rf /tmp/app/. $app_dir
5554
else
56-
cat | tar -xmC $app_dir
55+
cat | tar -xmC $app_dir
5756
fi
5857

5958
# In heroku, there are two separate directories, and some
@@ -73,24 +72,24 @@ buildpacks=($buildpack_root/*)
7372
selected_buildpack=
7473

7574
if [[ -n "$BUILDPACK_URL" ]]; then
76-
echo_title "Fetching custom buildpack"
75+
echo_title "Fetching custom buildpack"
7776

78-
buildpack="$buildpack_root/custom"
79-
rm -fr "$buildpack"
80-
git clone --quiet --depth=1 "$BUILDPACK_URL" "$buildpack"
81-
selected_buildpack="$buildpack"
82-
buildpack_name=$($buildpack/bin/detect "$build_root") && selected_buildpack=$buildpack
77+
buildpack="$buildpack_root/custom"
78+
rm -fr "$buildpack"
79+
git clone --quiet --depth=1 "$BUILDPACK_URL" "$buildpack"
80+
selected_buildpack="$buildpack"
81+
buildpack_name=$($buildpack/bin/detect "$build_root") && selected_buildpack=$buildpack
8382
else
8483
for buildpack in "${buildpacks[@]}"; do
85-
buildpack_name=$($buildpack/bin/detect "$build_root") && selected_buildpack=$buildpack && break
84+
buildpack_name=$($buildpack/bin/detect "$build_root") && selected_buildpack=$buildpack && break
8685
done
8786
fi
8887

8988
if [[ -n "$selected_buildpack" ]]; then
90-
echo_title "$buildpack_name app detected"
91-
else
92-
echo_title "Unable to select a buildpack"
93-
exit 1
89+
echo_title "$buildpack_name app detected"
90+
else
91+
echo_title "Unable to select a buildpack"
92+
exit 1
9493
fi
9594

9695
## Buildpack compile
@@ -103,29 +102,29 @@ $selected_buildpack/bin/release "$build_root" "$cache_root" > $build_root/.relea
103102

104103
echo_title "Discovering process types"
105104
if [[ -f "$build_root/Procfile" ]]; then
106-
types=$(ruby -e "require 'yaml';puts YAML.load_file('$build_root/Procfile').keys().join(', ')")
107-
echo_normal "Procfile declares types -> $types"
105+
types=$(ruby -e "require 'yaml';puts YAML.load_file('$build_root/Procfile').keys().join(', ')")
106+
echo_normal "Procfile declares types -> $types"
108107
fi
109108
default_types=""
110109
if [[ -s "$build_root/.release" ]]; then
111-
default_types=$(ruby -e "require 'yaml';puts (YAML.load_file('$build_root/.release')['default_process_types'] || {}).keys().join(', ')")
112-
[[ $default_types ]] && echo_normal "Default process types for $buildpack_name -> $default_types"
110+
default_types=$(ruby -e "require 'yaml';puts (YAML.load_file('$build_root/.release')['default_process_types'] || {}).keys().join(', ')")
111+
[[ $default_types ]] && echo_normal "Default process types for $buildpack_name -> $default_types"
113112
fi
114113

115114

116115
## Produce slug
117116

118117
if [[ -f "$build_root/.slugignore" ]]; then
119-
tar -z --exclude='.git' -X "$build_root/.slugignore" -C $build_root -cf $slug_file . | cat
118+
tar -z --exclude='.git' -X "$build_root/.slugignore" -C $build_root -cf $slug_file . | cat
120119
else
121-
tar -z --exclude='.git' -C $build_root -cf $slug_file . | cat
120+
tar -z --exclude='.git' -C $build_root -cf $slug_file . | cat
122121
fi
123122

124123
if [[ "$slug_file" != "-" ]]; then
125-
slug_size=$(du -Sh "$slug_file" | cut -f1)
126-
echo_title "Compiled slug size is $slug_size"
124+
slug_size=$(du -Sh "$slug_file" | cut -f1)
125+
echo_title "Compiled slug size is $slug_size"
127126

128-
if [[ $put_url ]]; then
129-
curl -0 -s -o /dev/null -X PUT -T $slug_file "$put_url"
130-
fi
127+
if [[ $put_url ]]; then
128+
curl -0 -s -o /dev/null -X PUT -T $slug_file "$put_url"
129+
fi
131130
fi

0 commit comments

Comments
 (0)