diff options
| author | Gordan Markuš <gordan.markus@pelagicore.com> | 2017-02-27 10:07:03 +0100 |
|---|---|---|
| committer | Gordan Markus <gordan.markus@pelagicore.com> | 2017-02-27 09:33:23 +0000 |
| commit | 0605ccb7bab4c787c68a623717e0eef7ebd7d26d (patch) | |
| tree | b9b01ea014e0bca87b9314f68a586a5978c6060c | |
| parent | 74b3f15cf43396fce210abbfa9146198e7af36d1 (diff) | |
| download | meta-boot2qt-0605ccb7bab4c787c68a623717e0eef7ebd7d26d.tar.gz | |
setup-environment: don't exit the shell on error
If the user doesn't source the setup-environment.sh script do not
exit the current terminal window
Change-Id: I4c1df6bab434a8342abcf96a7ed4b9ccc257c8aa
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rwxr-xr-x | scripts/setup-environment.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index 2f8264b..b6c4710 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh | |||
| @@ -44,7 +44,7 @@ done | |||
| 44 | THIS_SCRIPT="setup-environment.sh" | 44 | THIS_SCRIPT="setup-environment.sh" |
| 45 | if [ "$(basename -- $0)" = "${THIS_SCRIPT}" ]; then | 45 | if [ "$(basename -- $0)" = "${THIS_SCRIPT}" ]; then |
| 46 | echo "Error: This script needs to be sourced. Please run as '. $0'" | 46 | echo "Error: This script needs to be sourced. Please run as '. $0'" |
| 47 | exit 1 | 47 | return 1 |
| 48 | fi | 48 | fi |
| 49 | 49 | ||
| 50 | if [ -z "$MACHINE" ]; then | 50 | if [ -z "$MACHINE" ]; then |