mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 05:47:14 -04:00
Merge pull request #1862 from joshuaboniface/bump-version
Fix bump_version for submodule removal
This commit is contained in:
commit
aa9d7d7f04
27
bump_version
27
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
|
||||
|
Loading…
Reference in New Issue
Block a user