diff --git a/documentation/builders/installation.md b/documentation/builders/installation.md index e75344e06..3edbf0c23 100644 --- a/documentation/builders/installation.md +++ b/documentation/builders/installation.md @@ -120,8 +120,8 @@ cd; GIT_USER='MiczFlor' GIT_BRANCH='future3/develop' bash <(wget -qO- https://ra ``` > [!NOTE] -> For all branches *except* the current Release `future3/main`, the Web App needs to be build locally on the Pi. This is part of the installation process. -> If you make changes to the Web App sources you need to rebuild it manually. See the developers [Web App](../developers/webapp.md) documentation. +> Installation of the official repositories release branches ([Stable Release](#stable-release) and [Pre-Release](#pre-release)) will deploy a prebuilt bundle of the Web App. +> If you install another branch or from a fork repository the Web App needs to be build locally. This is part of the installation process. See the the developers [Web App](../developers/webapp.md) documentation for further details. ### Logs If you suspect an error you can monitor the installation process with diff --git a/installation/routines/customize_options.sh b/installation/routines/customize_options.sh index 2af8c4183..c509b2e5a 100644 --- a/installation/routines/customize_options.sh +++ b/installation/routines/customize_options.sh @@ -282,7 +282,7 @@ Disable Pi's on-chip audio (headphone / jack output)? [y/N]" _option_webapp_devel_build() { # Let's detect if we are on the official release branch - if [[ "$GIT_BRANCH" != "${GIT_BRANCH_RELEASE}" || "$GIT_USER" != "$GIT_UPSTREAM_USER" || "$CI_RUNNING" == "true" ]]; then + if [[ "$GIT_BRANCH" != "${GIT_BRANCH_RELEASE}" && "$GIT_BRANCH" != "${GIT_BRANCH_DEVELOP}" ]] || [[ "$GIT_USER" != "$GIT_UPSTREAM_USER" ]] || [[ "$CI_RUNNING" == "true" ]] ; then # Unless ENABLE_WEBAPP_PROD_DOWNLOAD is forced to true by user override, do not download a potentially stale build if [[ "$ENABLE_WEBAPP_PROD_DOWNLOAD" == "release-only" ]]; then ENABLE_WEBAPP_PROD_DOWNLOAD=false @@ -291,13 +291,14 @@ _option_webapp_devel_build() { clear_c print_c "--------------------- WEB APP BUILD --------------------- -You are installing from an unofficial branch. -Therefore a prebuilt Web App is not available and -it needs to be build locally. +You are installing from a non-release branch +and/or an unofficial repository. +Therefore a prebuilt Web App is not available +and it needs to be build locally. This requires Node to be installed. -If you choose to decline the lastest prebuilt -version from the main repository will be installed. +If you choose to decline the lastest prebuilt version +from the official repository will be installed. This can lead to incompatibilities. Do you want to build the Web App? [Y/n]"