Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
gforney committed Apr 20, 2023
2 parents 4651f50 + dc891cf commit b86c5e7
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Utilities/Scripts/qsmv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ else
exe=$REPOROOT/smv/Build/smokeview/intel_linux_64/smokeview_linux_64
smvdir=$(dirname "${smvpath}")
if [ "$SMVBINDIR" == "" ]; then
SMVBINDIR="-bindir $REPOROOT/bot/Bundle/smv/for_bundle"
SMVBINDIR="-bindir $REPOROOT/bot/Bundlebot/smv/for_bundle"
fi
fi
fi
Expand Down
2 changes: 1 addition & 1 deletion Utilities/Scripts/slice2html.sh
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ if [ ! -e $SMOKEVIEW ]; then
SMOKEVIEW=$SMVREPO/Build/smokeview/intel_linux_64/smokeview_linux_test_64
fi

SMVBINDIR=$BOTREPO/Bundle/smv/for_bundle
SMVBINDIR=$BOTREPO/Bundlebot/smv/for_bundle

CONFIGDIR=$HOME/.smokeview
if [ ! -e $CONFIGDIR ]; then
Expand Down
2 changes: 1 addition & 1 deletion Utilities/Scripts/slice2mp4.sh
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ ROOTDIR=`pwd`
SMVREPO=$ROOTDIR/smv
BOTREPO=$ROOTDIR/bot
cd $CURDIR
SMOKEVIEWBINDIR=$BOTREPO/Bundle/smv/for_bundle
SMOKEVIEWBINDIR=$BOTREPO/Bundlebot/smv/for_bundle
SMOKEVIEW=$SMVREPO/Build/smokeview/intel_linux_64/smokeview_linux_64
if [ ! -e $SMOKEVIEW ]; then
SMOKEVIEW=$SMVREPO/Build/smokeview/intel_linux_64/smokeview_linux_test_64
Expand Down
2 changes: 1 addition & 1 deletion Utilities/Scripts/smokeview_ng.sh
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ VERSION2=$PLATFORM$SIZE
SMOKEVIEW=$FIREMODELS_ROOT/smv/Build/smokeview/intel_$VERSION2/smokeview_$VERSION

if [ "$BINDIR" == "" ]; then
BINDIR="$FIREMODELS_ROOT/bot/Bundle/smv/for_bundle"
BINDIR="$FIREMODELS_ROOT/bot/Bundlebot/smv/for_bundle"
fi
SMVBINDIR="-bindir $BINDIR"

Expand Down

0 comments on commit b86c5e7

Please sign in to comment.