Skip to content

Commit 5731c43

Browse files
committed
Addressed @aashish24 concerns
1 parent 7226d92 commit 5731c43

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

CMake/cdat_modules_extra/setup_runtime.csh.in

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ endif
2222
# which can lead to errors.
2323
if ( $?UVCDAT_SETUP_PATH ) then
2424
if ( ${UVCDAT_SETUP_PATH} == ${install_prefix} ) then
25-
echo 'Nothing to do UVCDAT is already setup at '${UVCDAT_SETUP_PATH}
26-
exit 1
25+
echo 'Nothing to do since UVCDAT is already setup at '${UVCDAT_SETUP_PATH}
26+
exit 0
2727
else
28-
echo 'ERROR: UVCDAT setup was previously sourced at '${UVCDAT_SETUP_PATH}
29-
echo 'ERROR: There is no need to run setup_runtime manually anymore.'
30-
echo 'ERROR: Open a new shell in order to use a different install location.'
31-
exit 1
28+
echo 'INFO: UVCDAT setup was previously sourced at '${UVCDAT_SETUP_PATH}
29+
echo 'INFO: There is no need to run setup_runtime manually anymore.'
30+
echo 'INFO: Open a new shell in order to use a different install location.'
31+
exit 0
3232
endif
3333
endif
3434

@@ -92,7 +92,7 @@ setenv UVCDAT_SETUP_PATH ${install_prefix}
9292

9393
unset install_prefix
9494

95-
echo 'Successfully updated your environment to use UV-CDAT'
95+
echo 'Successfully updated your environment to use UVCDAT'
9696
echo '(changes are valid for this session/terminal only)'
9797
echo 'Version: '${UVCDAT_PROMPT_STRING}
9898
echo 'Location: '${UVCDAT_SETUP_PATH}

CMake/cdat_modules_extra/setup_runtime.sh.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ function cleanup {
1010
# which can lead to errors.
1111
if [ -n "${UVCDAT_SETUP_PATH}" ] ; then
1212
if [ "${UVCDAT_SETUP_PATH}" = "${install_prefix}" ] ; then
13-
echo "Nothing to do UVCDAT is already setup at: ${UVCDAT_SETUP_PATH}" 1>&2
13+
echo "Nothing to do since UVCDAT is already setup at: ${UVCDAT_SETUP_PATH}" 1>&2
1414
cleanup
1515
return 0
1616
else
17-
echo "ERROR: UVCDAT setup was previously sourced at: ${UVCDAT_SETUP_PATH}" 1>&2
18-
echo "ERROR: There is no need to run setup_runtime manually anymore." 1>&2
19-
echo "ERROR: Open a new shell in order to use a different install location." 1>&2
17+
echo "INFO: UVCDAT setup was previously sourced at: ${UVCDAT_SETUP_PATH}" 1>&2
18+
echo "INFO: There is no need to run setup_runtime manually anymore." 1>&2
19+
echo "INFO: Open a new shell in order to use a different install location." 1>&2
2020
cleanup
21-
return 1
21+
return 0
2222
fi
2323
fi
2424

@@ -86,7 +86,7 @@ export PYTHONPATH
8686

8787
export UVCDAT_SETUP_PATH="${install_prefix}"
8888
cleanup
89-
echo "Successfully updated your environment to use UV-CDAT" 1>&2
89+
echo "Successfully updated your environment to use UVCDAT" 1>&2
9090
echo "(changes are valid for this session/terminal only)" 1>&2
9191
echo "Version: ${UVCDAT_PROMPT_STRING}" 1>&2
9292
echo "Location: ${UVCDAT_SETUP_PATH}" 1>&2

0 commit comments

Comments
 (0)