diff options
| author | Vasily <JustAMan@users.noreply.github.com> | 2019-10-08 16:04:55 +0300 |
|---|---|---|
| committer | Joshua Boniface <joshua@boniface.me> | 2019-10-20 14:21:06 -0400 |
| commit | 818d21718c496adc0e14c4962f584eb4e3c50df4 (patch) | |
| tree | e9575dbc6bcc7c6bcbeffacc4539781a9966caf7 | |
| parent | 0b551c0cd4114234ad728d4fa3b01a7c43bee81f (diff) | |
Merge pull request #1862 from joshuaboniface/bump-version
Fix bump_version for submodule removal
(cherry picked from commit aa9d7d7f04e72f71e1ccaabc3035b86ac0d0b8c0)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
| -rwxr-xr-x | bump_version | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/bump_version b/bump_version index 590020864..106dd7a78 100755 --- a/bump_version +++ b/bump_version @@ -24,33 +24,6 @@ fi shared_version_file="./SharedVersion.cs" build_file="./build.yaml" -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 - -# configure branch -pushd MediaBrowser.WebDashboard/jellyfin-web - -if ! git diff-index --quiet HEAD --; then - popd - echo - echo "ERROR: Your 'jellyfin-web' submodule working directory is not clean!" - echo "This script will overwrite your unstaged and unpushed changes." - echo "Please do development on 'jellyfin-web' outside of the submodule." - exit 1 -fi - -git fetch --all -git checkout origin/${web_branch} -popd - -git add MediaBrowser.WebDashboard/jellyfin-web - new_version="$1" # Parse the version from the AssemblyVersion |