Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-29 13:06:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Other: grab version number from top-level Makefile.

Browse Source 
Other: PowerShell script uses $MyInvocation.MyCommand.Path instead of $PSScriptRoot
This commit is contained in:
Xavier Michelon
2022-08-19 18:37:39 +02:00
committed by Jakub
parent 34a9d1d125
commit 090aaf8ee3
10 changed files with 50 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/frontend/bridge-gui/bridge-gui/build.sh
View File

@ -22,8 +22,9 @@ if [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "win32" ]] ; then
fi
BRIDGE_REPO_ROOT="../../../.."
BRIDGE_INSTALL_PATH=${BRIDGE_INSTALL_PATH:-deploy}
BRIDGE_APP_VERSION=${BRIDGE_APP_VERSION:-2.2.1+git}
BRIDGE_APP_VERSION=${BRIDGE_APP_VERSION:-$("${BRIDGE_REPO_ROOT}/utils/bridge_app_version.sh")}
BUILD_CONFIG=${BRIDGE_GUI_BUILD_CONFIG:-Debug}
BUILD_DIR=$(echo "./cmake-build-${BUILD_CONFIG}" | tr '[:upper:]' '[:lower:]')
@ -51,7 +52,7 @@ check_exit() {
fi
}
VCPKG_ROOT="../../../../extern/vcpkg"
VCPKG_ROOT="${BRIDGE_REPO_ROOT}/extern/vcpkg"
git submodule update --init --recursive ${VCPKG_ROOT}
check_exit "Failed to initialize vcpkg as a submodule."