diff --git a/README.md b/README.md index fd5a0c8..5d7baf3 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Please keep in mind to check the `.env` file for changes, when you perform an up To get started with all the defaults, simply clone the repo and run `./install.sh` in your local check-out. Sentry uses Python 3 by default since December 4th, 2020 and Sentry 21.1.0 is the last version to support Python 2. -During the install, a prompt will ask if you want to create a user account. If you require that the install not be blocked by the prompt, run `./install.sh --no-user-prompt`. +During the install, a prompt will ask if you want to create a user account. If you require that the install not be blocked by the prompt, run `./install.sh --skip-user-prompt`. Please visit [our documentation](https://develop.sentry.dev/self-hosted/) for everything else. diff --git a/install/check-latest-commit.sh b/install/check-latest-commit.sh index 003639e..7f35660 100644 --- a/install/check-latest-commit.sh +++ b/install/check-latest-commit.sh @@ -1,11 +1,15 @@ -#!/bin/bash +echo "${_group}Checking for latest commit ... " # Checks if we are on latest commit from github if it is running from master branch if [[ -d "../.git" && "${SKIP_COMMIT_CHECK:-0}" != 1 ]]; then if [[ $(git branch | sed -n '/\* /s///p') == "master" ]]; then if [[ $(git rev-parse HEAD) != $(git ls-remote $(git rev-parse --abbrev-ref @{u} | sed 's/\// /g') | cut -f1) ]]; then - echo "Seems like you are not using the latest commit from self-hosted repository. Please pull the latest changes and try again."; + echo "Seems like you are not using the latest commit from the self-hosted repository. Please pull the latest changes and try again, or suppress this check with --skip-commit-check."; exit 1 fi fi +else + echo "skipped" fi + +echo "${_endgroup}" diff --git a/install/parse-cli.sh b/install/parse-cli.sh index 9492a89..4712fd6 100644 --- a/install/parse-cli.sh +++ b/install/parse-cli.sh @@ -4,14 +4,20 @@ show_help() { cat <