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

Fix in detecting cmssw environment in cmsShow script for patch releases #3149

Merged
merged 1 commit into from Apr 2, 2014
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 2 additions & 15 deletions Fireworks/Core/scripts/cmsShow
Expand Up @@ -96,20 +96,7 @@ setupEnv()
fi

# see if we are running in standalone mode
FROM_RELEASE=""
if [ -n "$CMSSW_BASE" ] && [ `expr "$SHELLDIR" : "$CMSSW_BASE"` -gt 0 ]; then
FROM_RELEASE='true'
elif [ -n "$CMSSW_RELEASE_BASE" ]; then
if [ `expr "$SHELLDIR" : "$CMSSW_RELEASE_BASE"` -gt 0 ]; then
FROM_RELEASE='true'
else
NO_PATCH_CMSSWRB=`echo $CMSSW_RELEASE_BASE | sed 's/cmssw-patch/cmssw/; s/\(CMSSW_[0-9_]*\)_patch[0-9]\+/\1/;'`
if [ `expr "$SHELLDIR" : "$NO_PATCH_CMSSWRB"` -gt 0 ]; then
FROM_RELEASE='true'
fi
fi
fi
if [ -z "$FROM_RELEASE" ]; then
if [ ! -d $SHELLDIR/../../.SCRAM ] ; then
export CMSSW_BASE=$SHELLDIR
export CMSSW_SEARCH_PATH="."
export CMSSW_DATA_PATH="."
Expand Down Expand Up @@ -215,7 +202,7 @@ creport=`mktemp /tmp/cmsshow-crash-report-XXXXXXXX`.txt
exitStatus=$?
if [ $exitStatus -gt 0 ] && [ $exitStatus -ne 137 ] && [ "$rootflag" != "on" ] ; then
writeSystemInfoToFile $creport
cmsShowSendReport ${creport}
"$SHELLDIR/cmsShowSendReport" ${creport}
echo ""
msgLen=75;
awk -v msgLen=$msgLen 'BEGIN {printf(" %c", 35); i=0; while ( i <= msgLen) { printf( "%c", 35 ); ++i}; print ""; }'
Expand Down