From 4e5bdb8f2943c1223da89d765f4001f56258bcfd Mon Sep 17 00:00:00 2001 From: Victor Popov Date: Mon, 12 Aug 2019 18:36:10 +0300 Subject: [PATCH] Configure.sh rewrite review fixes - Add override hierarchy description as comment. - Be more verbose about used private configuration. - Some rephrase for boost errors messages. --- configure.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.sh b/configure.sh index 6b5c1930cd..2f36b4b749 100755 --- a/configure.sh +++ b/configure.sh @@ -1,6 +1,12 @@ #!/bin/bash # Please run this script to configure the repository after cloning it. +# When configuring with private repository, the following override hierarchy is used: +# - commandline parameters - most specific, always wins. +# - stdin parameters. +# - saved repository - least specific, if present. +# - fallback to opensource mode. + # Stop on the first error. set -e -u @@ -48,6 +54,7 @@ pwProjectId=A123456789012 } setup_private() { + echo "Setting up private configuration: repo '$PRIVATE_REPO', branch '$PRIVATE_BRANCH'" if git clone --depth 1 --no-single-branch "$PRIVATE_REPO" "$TMP_REPO_DIR"; then echo "$PRIVATE_REPO" > "$SAVED_PRIVATE_REPO_FILE" echo "$PRIVATE_BRANCH" > "$SAVED_PRIVATE_BRANCH_FILE" @@ -103,12 +110,12 @@ fi # TODO: Remove these lines when XCode project is finally generated by CMake. if [ ! -d "$BASE_PATH/3party/boost/" ]; then echo "You need to have boost submodule present to run bootstrap.sh" - echo "Try to do 'git submodule update --init --recursive'" + echo "Try 'git submodule update --init --recursive'" exit 1 fi if [ ! -d "$BASE_PATH/3party/boost/tools" ]; then echo "Boost's submodule tools is not present, but required for bootstrap" - echo "Try to do 'git submodule update --init --recursive'" + echo "Try 'git submodule update --init --recursive'" exit 1 fi cd $BASE_PATH/3party/boost/