File tree Expand file tree Collapse file tree 2 files changed +19
-7
lines changed Expand file tree Collapse file tree 2 files changed +19
-7
lines changed Original file line number Diff line number Diff line change @@ -16,20 +16,32 @@ Options:
1616 upgrades.
1717 --skip-commit-check Skip the check for the latest commit when on the master
1818 branch of a \` self-hosted\` Git working copy.
19- --skip-user-prompt Skip the initial user creation prompt (ideal for non-
19+ --skip-user-creation Skip the initial user creation prompt (ideal for non-
2020 interactive installs).
2121EOF
2222}
2323
24- SKIP_USER_PROMPT=" ${SKIP_USER_PROMPT:- } "
24+ depwarn () {
25+ echo " WARNING The $1 is deprecated. Please use $2 instead."
26+ }
27+
28+ if [ ! -z " ${SKIP_USER_PROMPT:- } " ]; then
29+ depwarn " SKIP_USER_PROMPT variable" " SKIP_USER_CREATION"
30+ SKIP_USER_CREATION=" ${SKIP_USER_PROMPT} "
31+ fi
32+
33+ SKIP_USER_CREATION=" ${SKIP_USER_CREATION:- } "
2534MINIMIZE_DOWNTIME=" ${MINIMIZE_DOWNTIME:- } "
2635SKIP_COMMIT_CHECK=" ${SKIP_COMMIT_CHECK:- } "
2736
2837while (( $# )) ; do
2938 case " $1 " in
3039 -h | --help) show_help; exit ;;
31- --no-user-prompt) SKIP_USER_PROMPT=1;; # deprecated
32- --skip-user-prompt) SKIP_USER_PROMPT=1;;
40+ --no-user-prompt) SKIP_USER_CREATION=1;
41+ depwarn " --no-user-prompt flag" " --skip-user-creation" ;;
42+ --skip-user-prompt) SKIP_USER_CREATION=1;
43+ depwarn " --skip-user-prompt flag" " --skip-user-creation" ;;
44+ --skip-user-creation) SKIP_USER_CREATION=1;;
3345 --minimize-downtime) MINIMIZE_DOWNTIME=1;;
3446 --skip-commit-check) SKIP_COMMIT_CHECK=1;;
3547 --) ;;
Original file line number Diff line number Diff line change 11echo " ${_group} Setting up / migrating database ..."
22
3- if [[ -n " ${CI:- } " || " ${SKIP_USER_PROMPT :- 0} " == 1 ]]; then
3+ if [[ -n " ${CI:- } " || " ${SKIP_USER_CREATION :- 0} " == 1 ]]; then
44 $dcr web upgrade --noinput
55 echo " "
6- echo " Did not prompt for user creation due to non-interactive shell. "
7- echo " Run the following command to create one yourself (recommended):"
6+ echo " Did not prompt for user creation. Run the following command to create one "
7+ echo " yourself (recommended):"
88 echo " "
99 echo " $dc_base run --rm web createuser"
1010 echo " "
You can’t perform that action at this time.
0 commit comments