File tree Expand file tree Collapse file tree 2 files changed +15
-5
lines changed Expand file tree Collapse file tree 2 files changed +15
-5
lines changed Original file line number Diff line number Diff line change @@ -22,11 +22,12 @@ endif
2222# which can lead to errors.
2323if ( $?UVCDAT_SETUP_PATH ) then
2424 if ( ${UVCDAT_SETUP_PATH} == ${install_prefix} ) then
25- echo 'UVCDAT setup already sourced for this install location.'
26- exit 1
25+ echo 'Nothing to do since UVCDAT is already setup at '${UVCDAT_SETUP_PATH}
26+ exit 0
2727 else
2828 echo 'ERROR: UVCDAT setup was previously sourced at '${UVCDAT_SETUP_PATH}
29- echo 'Open a new shell in order to use a different install location.'
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.'
3031 exit 1
3132 endif
3233endif
@@ -91,3 +92,7 @@ setenv UVCDAT_SETUP_PATH ${install_prefix}
9192
9293unset install_prefix
9394
95+ echo 'Successfully updated your environment to use UVCDAT'
96+ echo '(changes are valid for this session/terminal only)'
97+ echo 'Version: '${UVCDAT_PROMPT_STRING}
98+ echo 'Location: '${UVCDAT_SETUP_PATH}
Original file line number Diff line number Diff line change @@ -10,10 +10,11 @@ function cleanup {
1010# which can lead to errors.
1111if [ -n " ${UVCDAT_SETUP_PATH} " ] ; then
1212 if [ " ${UVCDAT_SETUP_PATH} " = " ${install_prefix} " ] ; then
13+ echo " Nothing to do since UVCDAT is already setup at: ${UVCDAT_SETUP_PATH} " 1>&2
1314 cleanup
1415 return 0
1516 else
16- echo " ERROR: UVCDAT setup was previously sourced at \" ${UVCDAT_SETUP_PATH} \" " 1>&2
17+ echo " ERROR: UVCDAT setup was previously sourced at: ${UVCDAT_SETUP_PATH} " 1>&2
1718 echo " ERROR: There is no need to run setup_runtime manually anymore." 1>&2
1819 echo " ERROR: Open a new shell in order to use a different install location." 1>&2
1920 cleanup
2324
2425# Check that the install prefix exists, otherwise stop.
2526if [ ! -d " ${install_prefix} " ] ; then
26- echo " ERROR: \" ${install_prefix} \" is not a directory." 1>&2
27+ echo " ERROR: ${install_prefix} is not a directory." 1>&2
2728 cleanup
2829 return 1
2930fi
@@ -85,4 +86,8 @@ export PYTHONPATH
8586
8687export UVCDAT_SETUP_PATH=" ${install_prefix} "
8788cleanup
89+ echo " Successfully updated your environment to use UVCDAT" 1>&2
90+ echo " (changes are valid for this session/terminal only)" 1>&2
91+ echo " Version: ${UVCDAT_PROMPT_STRING} " 1>&2
92+ echo " Location: ${UVCDAT_SETUP_PATH} " 1>&2
8893return 0
You can’t perform that action at this time.
0 commit comments