@@ -27,7 +27,8 @@ echo "-----> Will use Erlang ${erlang_version} and Elixir ${elixir_version}"
2727erlang_tar=" OTP_${erlang_version} .tgz"
2828erlang_source_url=" https://s3.amazonaws.com/heroku-buildpack-erlang/${erlang_tar} "
2929elixir_tar=" v${elixir_version} .tar.gz"
30- elixir_source_url=" https://github.com/elixir-lang/elixir/archive/${elixir_tar} "
30+ elixir_zip=" v${elixir_version} .zip"
31+ elixir_source_url=" https://github.com/elixir-lang/elixir/releases/download/v${elixir_version} /${elixir_zip} "
3132
3233(
3334 set -e
@@ -60,33 +61,41 @@ PATH=${build_pack_dir}:$PATH
6061 set -e
6162
6263 # If already cached tarball, means already fetched.
63- test -f ${cache_dir} /${elixir_tar } && exit
64+ test -f ${cache_dir} /${elixir_zip } && exit
6465
6566 cd ${cache_dir}
6667 echo " -----> Fetching Elixir ${elixir_version} from ${elixir_source_url} "
6768 curl -LksO ${elixir_source_url} || exit 1
6869)
6970
7071rm -rf ${elixir_root}
71- echo " -----> Extracting: ${cache_dir} /${elixir_tar} "
72- tar zxf ${cache_dir} /${elixir_tar}
73- mv " elixir-${elixir_version} " ${elixir_root}
72+ echo " -----> Extracting: ${cache_dir} /${elixir_zip} "
7473
75- (
76- set -e
74+ # ## Use tar only if master
75+ # tar zxf ${cache_dir}/${elixir_tar}
76+ # mv "elixir-${elixir_version}" ${elixir_root}
7777
78- echo " -----> Building Elixir ${elixir_version} "
79- cd ${elixir_root}
80- make > /dev/null
81- )
78+
79+ mkdir ${elixir_root}
80+ cd ${elixir_root}
81+
82+ # Extract the zip file using jar cmd. OH WHATTAY HACK.
83+ jar xf ${cache_dir} /${elixir_zip}
84+
85+ cd -
86+
87+ # ## Use only if building from source
88+ # (
89+ # set -e
90+ #
91+ # echo "-----> Building Elixir ${elixir_version}"
92+ # cd ${elixir_root}
93+ # make > /dev/null
94+ # )
8295
8396ln -s ${elixir_root} /app/elixir
8497PATH=/app/elixir/bin:$PATH
8598
86- echo ` pwd`
87- cd ${build_dir}
88- echo ` pwd`
89-
9099# Unset this var so that if the parent dir is a git repo, it isn't detected
91100# And all git operations are performed on the respective repos
92101unset GIT_DIR
0 commit comments