diff options
| author | Brad King <brad.king@kitware.com> | 2019-08-26 14:33:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-26 14:37:18 (GMT) |
| commit | 1811f2b3716e4067d8ce1a230948999d7d5b343d (patch) | |
| tree | 2289967bb69a45b35b8f7da9a3705146ad9bca01 /Modules | |
| parent | e7d7cd47ed85678f29c18d63ef723f1a923d5742 (diff) | |
| parent | 4c8741eb86c6a22298e815c4e34d3ccc0fffe1f4 (diff) | |
| download | CMake-1811f2b3716e4067d8ce1a230948999d7d5b343d.zip CMake-1811f2b3716e4067d8ce1a230948999d7d5b343d.tar.gz CMake-1811f2b3716e4067d8ce1a230948999d7d5b343d.tar.bz2 | |
Merge topic 'cpack-stgz-license-prompt'
4c8741eb86 CPack/STGZ: Require explicit acceptance or refusal of license
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3717
Diffstat (limited to 'Modules')
| -rwxr-xr-x | Modules/Internal/CPack/CPack.STGZ_Header.sh.in | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/Modules/Internal/CPack/CPack.STGZ_Header.sh.in b/Modules/Internal/CPack/CPack.STGZ_Header.sh.in index 003fcfe..a857aa5 100755 --- a/Modules/Internal/CPack/CPack.STGZ_Header.sh.in +++ b/Modules/Internal/CPack/CPack.STGZ_Header.sh.in @@ -86,15 +86,19 @@ then @CPACK_RESOURCE_FILE_LICENSE_CONTENT@ ____cpack__here_doc____ echo - echo "Do you accept the license? [yN]: " - read line leftover - case ${line} in - y* | Y*) - cpack_license_accepted=TRUE;; - *) - echo "License not accepted. Exiting ..." - exit 1;; - esac + while true + do + echo "Do you accept the license? [yn]: " + read line leftover + case ${line} in + y* | Y*) + cpack_license_accepted=TRUE + break;; + n* | N* | q* | Q* | e* | E*) + echo "License not accepted. Exiting ..." + exit 1;; + esac + done fi if [ "x${cpack_include_subdir}x" = "xx" ] |