From 99dfb8549f3c2a633e15efc64c51cb8a7b78bd86 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Sat, 19 Jan 2019 21:57:29 -0500 Subject: [PATCH] Use the same branch for web by default --- build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build b/build index fc021397cc..f50311d0a2 100755 --- a/build +++ b/build @@ -26,7 +26,7 @@ usage() { echo -e " $ build --list-actions " echo -e " $ build [-b/--web-branch ] " echo -e "" - echo -e "The web_branch defaults to 'master'." + echo -e "The web_branch defaults to the same branch name as the current main branch." echo -e "To build all platforms, use 'all'." echo -e "To perform all build actions, use 'all'." echo -e "Build output files are collected at '../jellyfin-build/'." @@ -67,7 +67,7 @@ if [[ $1 == '-b' || $1 == '--web-branch' ]]; then web_branch="$2" shift 2 else - web_branch="master" + web_branch="$( git branch 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/' )" fi # Parse platform option