Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove trace from link script #1046

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions sorc/link_workflow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

#--make symbolic links for EMC installation and hardcopies for NCO delivery

trap 'echo "${BASH_SOURCE[0]} encounted an error at line ${LINENO} (rc=$?)"' ERR

function usage() {
cat << EOF
Builds all of the global-workflow components by calling the individual build
Expand All @@ -15,9 +17,10 @@ Usage: ${BASH_SOURCE[0]} [-h][-o]
EOF
exit 1
}
set -eux

RUN_ENVIR="EMC"
set -eu

RUN_ENVIR="emc"

# Reset option counter in case this script is sourced
OPTIND=1
Expand All @@ -26,7 +29,7 @@ while getopts ":ho" option; do
h) usage ;;
o)
echo "-o option received, configuring for NCO"
RUN_ENVIR="NCO";;
RUN_ENVIR="nco";;
:)
echo "[${BASH_SOURCE[0]}]: ${option} requires an argument"
usage
Expand Down Expand Up @@ -105,7 +108,7 @@ done

if [ -d "${script_dir}/ufs_utils.fd" ]; then
cd "${script_dir}/ufs_utils.fd/fix" || exit 1
./link_fixdirs.sh "${RUN_ENVIR}" "${machine}"
./link_fixdirs.sh "${RUN_ENVIR}" "${machine}" 2> /dev/null
fi


Expand Down Expand Up @@ -420,6 +423,7 @@ if [[ "${RUN_ENVIR}" == "nco" ]] ; then
fi
#------------------------------

echo "${BASH_SOURCE[0]} completed successfully"

exit 0