From 818d21718c496adc0e14c4962f584eb4e3c50df4 Mon Sep 17 00:00:00 2001 From: Vasily Date: Tue, 8 Oct 2019 16:04:55 +0300 Subject: [PATCH] Merge pull request #1862 from joshuaboniface/bump-version Fix bump_version for submodule removal (cherry picked from commit aa9d7d7f04e72f71e1ccaabc3035b86ac0d0b8c0) Signed-off-by: Joshua Boniface --- bump_version | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/bump_version b/bump_version index 5900208647..106dd7a78e 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