diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-09-02 20:03:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-02 20:03:31 -0400 |
| commit | 2aecc3fa1bdf067e6b5913c72c539b21aeefdc63 (patch) | |
| tree | 902c235681d82fdc0a08128e710c2d91f689e730 /bump_version | |
| parent | e2577ea1c703b3030736485c26fe3cd2b0802ad9 (diff) | |
| parent | 742102b5416a42ee6c9496f98758db553a6e27d0 (diff) | |
Merge pull request #1699 from joshuaboniface/bump-version
Bump version to 10.4.0
Diffstat (limited to 'bump_version')
| -rwxr-xr-x | bump_version | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bump_version b/bump_version index 398caee15c..5900208647 100755 --- a/bump_version +++ b/bump_version @@ -24,7 +24,11 @@ fi shared_version_file="./SharedVersion.cs" build_file="./build.yaml" -web_branch="$( git branch 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/' )" +if [[ -z $2 ]]; then + web_branch="$( git branch 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/' )" +else + web_branch="$2" +fi # Initialize submodules git submodule update --init --recursive @@ -80,7 +84,7 @@ fi # Set the Dockerfile web version to the specified new_version old_version="$( grep "JELLYFIN_WEB_VERSION=" Dockerfile \ - | sed -E 's/ARG JELLYFIN_WEB_VERSION=([0-9\.]+[-a-z0-9]*)/\1/' + | sed -E 's/ARG JELLYFIN_WEB_VERSION=v([0-9\.]+[-a-z0-9]*)/\1/' )" echo $old_version |