diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-23 19:20:37 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-25 11:58:46 +0000 |
| commit | b71d6ac713da96581494a0b80b4f8e73b5902496 (patch) | |
| tree | bcaec14ac32f5b0eb22ba165bb4e5e6574a7ba49 /configure | |
| parent | c92f0d204926862a00101d2b124abacc9bf6977f (diff) | |
ensure that no license queries are made in -redo mode
implement it in configure.exe and fix it in configure.sh.
Change-Id: I30764f4cba4bad0f23bfb40ce7a2ca614e1afd71
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -1045,9 +1045,13 @@ if [ "$COMMERCIAL_USER" = "ask" ]; then echo if [ "$commercial" = "c" ]; then COMMERCIAL_USER="yes" + OPT_CMDLINE="$OPT_CMDLINE +-commercial" break elif [ "$commercial" = "o" ]; then COMMERCIAL_USER="no" + OPT_CMDLINE="$OPT_CMDLINE +-opensource" break fi done @@ -1935,8 +1939,10 @@ fi # finally save the executed command to another script #------------------------------------------------------------------------------- if [ $CFG_REDO = no ]; then - echo "$OPT_CMDLINE" | grep '\-confirm\-license' >/dev/null 2>&1 || OPT_CMDLINE="$OPT_CMDLINE + if [ "$OPT_CONFIRM_LICENSE" = "no" ]; then + OPT_CMDLINE="$OPT_CMDLINE -confirm-license" + fi # skip first line, as it's always empty due to unconditional field separation echo "$OPT_CMDLINE" | tail -n +2 > config.opt |