aboutsummaryrefslogtreecommitdiffstats
path: root/kerl
diff options
context:
space:
mode:
authorYurii Rashkovskii <[email protected]>2012-12-07 22:07:10 -0800
committerYurii Rashkovskii <[email protected]>2012-12-07 22:07:10 -0800
commit4a91edb85ff6e54ba70a422d6090d0d17c89d5ec (patch)
tree9b263e12bc24dca7d265448ab729a31d20d6baa4 /kerl
parent6cce35d35bed9f72ecfa00943253e05d5bc3d5b7 (diff)
parent58f74f316678e62d47841f3c19cdf8ad0251b01b (diff)
downloadkerl-4a91edb85ff6e54ba70a422d6090d0d17c89d5ec.tar.gz
kerl-4a91edb85ff6e54ba70a422d6090d0d17c89d5ec.tar.bz2
kerl-4a91edb85ff6e54ba70a422d6090d0d17c89d5ec.zip
Merge pull request #34 from norton/dev
Changes to permit building Erlang/OTP R15B03-1
Diffstat (limited to 'kerl')
-rwxr-xr-xkerl8
1 files changed, 6 insertions, 2 deletions
diff --git a/kerl b/kerl
index 43220d6..fa7f881 100755
--- a/kerl
+++ b/kerl
@@ -114,7 +114,7 @@ if [ $# -eq 0 ]; then usage; fi
get_releases()
{
curl -s $ERLANG_DOWNLOAD_URL/ | \
- sed $SED_OPT -e 's/^.*>otp_src_(R1[-1234567890ABCD]+)\.tar\.gz<.*$/\1/' \
+ sed $SED_OPT -e 's/^.*<[aA] [hH][rR][eE][fF]=\"\/download\/otp_src_(R1[-1234567890ABCD]+)\.tar\.gz\">.*$/\1/' \
-e '/^R/!d'
}
@@ -326,7 +326,11 @@ do_build()
mkdir -p "$KERL_BUILD_DIR/$2"
if [ ! -d "$KERL_BUILD_DIR/$2/otp_src_$1" ]; then
echo "Extracting source code"
- cd "$KERL_BUILD_DIR/$2" && tar xfz "$KERL_DOWNLOAD_DIR/$FILENAME"
+ UNTARDIRNAME="$KERL_BUILD_DIR/$2/otp_src_$1-kerluntar-$$"
+ rm -rf "$UNTARDIRNAME"
+ mkdir -p "$UNTARDIRNAME"
+ (cd "$UNTARDIRNAME" && tar xfz "$KERL_DOWNLOAD_DIR/$FILENAME" && mv * "$KERL_BUILD_DIR/$2/otp_src_$1")
+ rm -rf "$UNTARDIRNAME"
fi
echo "Building Erlang/OTP $1 ($2), please wait..."
ERL_TOP="$KERL_BUILD_DIR/$2/otp_src_$1"