diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure.erl | 2 | ||||
| -rwxr-xr-x | tools/set-dep-versions | 26 |
2 files changed, 21 insertions, 7 deletions
diff --git a/tools/configure.erl b/tools/configure.erl index bc0f87eb7..09d787a54 100644 --- a/tools/configure.erl +++ b/tools/configure.erl @@ -5,7 +5,7 @@ %%% Created : 27 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2014 ProcessOne +%%% ejabberd, Copyright (C) 2002-2015 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/tools/set-dep-versions b/tools/set-dep-versions index 8d56cde4d..65b250516 100755 --- a/tools/set-dep-versions +++ b/tools/set-dep-versions @@ -19,9 +19,13 @@ die() get_dep_list() { - sed -n \ - '/.*{ *\([^,]*\),[^,]*, *{git, *"\([^"]*\)".*/ { - s//\1,\2/ + sed -n ' + /.*{ *\([^,]*\),[^,]*, *{ *git, *"\([^"]*\)" *} *}.*/ { + s//\1,\2,master/ + p + } + /.*{ *\([^,]*\),[^,]*, *{ *git, *"\([^"]*\)" *, *{ *branch, *"\([^"]*\)".*/ { + s//\1,\2,\3/ p }' "$rebar_script" } @@ -33,7 +37,15 @@ get_dep_name() get_dep_url() { - printf '%s' "${1#*,}" + dep_url=${1#*,} + dep_url=${dep_url%,*} + + printf '%s' "$dep_url" +} + +get_dep_branch() +{ + printf '%s' "${1##*,}" } get_dep_rev() @@ -51,9 +63,10 @@ clone_repo() { dep_name=$(get_dep_name "$1") dep_url=$(get_dep_url "$1") + dep_branch=$(get_dep_branch "$1") cd "$deps_dir" - git clone -q "$dep_url" "$dep_name" + git clone -q -b "$dep_branch" "$dep_url" "$dep_name" cd "$OLDPWD" } @@ -64,7 +77,8 @@ edit_rebar_script() dep_rev=$(get_dep_rev "$1") echo "Using revision $dep_rev of $dep_name" - sed "s|\"$dep_url\"[^}]*}|\"$dep_url\", \"$dep_rev\"}|" \ + sed -e "s|\"$dep_url\".*{ *branch[^}]*} *}|\"$dep_url\", \"$dep_rev\"}|" \ + -e "s|\"$dep_url\"[^}]*}|\"$dep_url\", \"$dep_rev\"}|" \ "$rebar_script" >"$temp_file" mv "$temp_file" "$rebar_script" } |