Skip to content

Commit bc6b391

Browse files
Fix Shellcheck warnings found with coverity scan
1 parent 5b34f7a commit bc6b391

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

common/python_wrapper.sh

100644100755
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#! /bin/sh
2-
EXEC_PATH=`readlink -f $0`
3-
EXEC_NAME=`basename $EXEC_PATH`
4-
EXEC_DIR=`dirname $EXEC_PATH`
2+
EXEC_PATH=$(readlink -f "$0")
3+
EXEC_NAME=$(basename "$EXEC_PATH")
54

65
mlibdir=@MST_LIB_DIR@
76
#@POST_MST_LIB_DIR@ # Update the lib dir by the post install script.
@@ -10,7 +9,7 @@ mbindir=@MST_BIN_DIR@
109

1110
MSTFLINT_EXT_PYTHON_LIB_DIR=$mlibdir/mstflint/python_ext_libs
1211
MSTFLINT_PYTHON_TOOLS=$mlibdir/mstflint/python_tools
13-
PY_TOOLS_REL_PATHS=$(dirname $0)/../lib/mstflint/python_tools:$(dirname $0)/../lib64/mstflint/python_tools
12+
PY_TOOLS_REL_PATHS=$(dirname "$0")/../lib/mstflint/python_tools:$(dirname "$0")/../lib64/mstflint/python_tools
1413

1514
if test -z "${PYTHONPATH}"; then
1615
PYTHONPATH=$MSTFLINT_PYTHON_TOOLS:$PY_TOOLS_REL_PATHS:$MSTFLINT_EXT_PYTHON_LIB_DIR
@@ -22,7 +21,7 @@ export PYTHONPATH
2221
export MSTFLINT_LIB_DIR=$mlibdir
2322
export LD_LIBRARY_PATH=$mlibdir
2423
export MSTFLINT_BIN_DIR=$mbindir
25-
PYTHON_EXEC=`find /usr/bin /bin/ /usr/local/bin -iname 'python*' 2>&1 | grep -e='*python[0-9,.]*' | sort -d | head -n 1`
24+
PYTHON_EXEC=$(find /usr/bin /bin/ /usr/local/bin -iname 'python*' 2>&1 | grep -e='*python[0-9,.]*' | sort -d | head -n 1)
2625
which python3 >/dev/null 2>&1
2726
if test $? -eq 0 ; then
2827
PYTHON_EXEC='/usr/bin/env python3'
@@ -35,8 +34,8 @@ fi
3534

3635
SCRIPT_PATH=$MSTFLINT_PYTHON_TOOLS/${EXEC_NAME}/${EXEC_NAME}.py
3736

38-
if test ! -f $SCRIPT_PATH; then
39-
SCRIPT_PATH=$(find $MSTFLINT_PYTHON_TOOLS $(echo $PY_TOOLS_REL_PATHS | sed "s/:/ /g") -name ${EXEC_NAME}.py 2>/dev/null | head -n 1)
37+
if test ! -f "$SCRIPT_PATH"; then
38+
SCRIPT_PATH=$(find "$MSTFLINT_PYTHON_TOOLS" "$(echo "$PY_TOOLS_REL_PATHS" | sed "s/:/ /g")" -name "${EXEC_NAME}.py" 2>/dev/null | head -n 1)
4039
fi
4140

4241
if test -z "${SCRIPT_PATH=}"; then

0 commit comments

Comments
 (0)