Skip to content

Commit 894ebbb

Browse files
JacksonTianyndu13
authored andcommitted
lint: improve coding style of shell scripts
1 parent e82b3b8 commit 894ebbb

File tree

2 files changed

+33
-32
lines changed

2 files changed

+33
-32
lines changed

release-core.sh

+28-28
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
1-
#!/bin/sh -xe
1+
#!/bin/bash
22

33
OPERATION=$2
44
PACKAGE_VERSION=$1
5-
PYTHON_BIN=`which python3`
6-
if [ $PYTHON_BIN == "" ]; then
5+
PYTHON_BIN=$(which python3)
6+
if [ "$PYTHON_BIN" == "" ]; then
77
echo "Python 3.x required."
88
exit 1
99
fi
10-
PYTHON_VERSION=`python3 --version | cut -d ' ' -f 2 | cut -d . -f 1,2`
10+
PYTHON_VERSION=$(python3 --version | cut -d ' ' -f 2 | cut -d . -f 1,2)
1111

1212
STAGING_DIR=${HOME}/python-sdk-core-distribute-staging
1313
SOURCE_NAME=aliyun-python-sdk-core
14-
SOURCE_DIR=`pwd`
14+
SOURCE_DIR=$(pwd)
1515
COPY_DIR=${STAGING_DIR}/copy
1616
UNPACK_DIR=${STAGING_DIR}/unpack
1717
INSTALL_DIR=${STAGING_DIR}/install
1818

1919

20-
if [ $OPERATION == "dist" ]; then
20+
if [ "$OPERATION" == "dist" ]; then
2121
echo "making package"
22-
rm ${STAGING_DIR} -rf
23-
mkdir -p ${COPY_DIR}
24-
cp -r ${SOURCE_NAME} ${COPY_DIR}/
25-
cd ${COPY_DIR}/${SOURCE_NAME}
22+
rm "${STAGING_DIR}" -rf
23+
mkdir -p "${COPY_DIR}"
24+
cp -r ${SOURCE_NAME} "${COPY_DIR}"/
25+
cd "${COPY_DIR}"/${SOURCE_NAME}
2626

27-
if [ $PACKAGE_VERSION == "core" ]; then
27+
if [ "$PACKAGE_VERSION" == "core" ]; then
2828
rm setup3.py dist *.egg-info -rf; python3 setup.py sdist
29-
elif [ $PACKAGE_VERSION == "core-v3" ]; then
29+
elif [ "$PACKAGE_VERSION" == "core-v3" ]; then
3030
rm setup.py dist *.egg-info -rf; mv setup3.py setup.py; python3 setup.py sdist
3131
fi
3232

3333
fi
3434

35-
if [ $OPERATION == "test" ]; then
35+
if [ "$OPERATION" == "test" ]; then
3636
echo "testing package"
37-
rm $UNPACK_DIR -rf
38-
rm $INSTALL_DIR -rf
39-
mkdir -p $UNPACK_DIR
40-
mkdir -p $INSTALL_DIR
41-
TAR_FILE=`find ${COPY_DIR}/${SOURCE_NAME}/dist -name aliyun-python-sdk-core*.tar.gz`
42-
cd $UNPACK_DIR; tar xvf $TAR_FILE
43-
cd `find . -name aliyun-python-sdk-core*`
37+
rm "$UNPACK_DIR" -rf
38+
rm "$INSTALL_DIR" -rf
39+
mkdir -p "$UNPACK_DIR"
40+
mkdir -p "$INSTALL_DIR"
41+
TAR_FILE=$(find "${COPY_DIR}"/${SOURCE_NAME}/dist -name aliyun-python-sdk-core*.tar.gz)
42+
cd "$UNPACK_DIR"; tar xvf "$TAR_FILE"
43+
cd $(find . -name aliyun-python-sdk-core*)
4444
SITE_PACKAGES=$INSTALL_DIR/lib/python$PYTHON_VERSION/site-packages
45-
mkdir $SITE_PACKAGES -p
46-
cp -r $SOURCE_DIR/$SOURCE_NAME/tests $SITE_PACKAGES/
47-
export PYTHONPATH=$SITE_PACKAGES
48-
python3 setup.py install --prefix=$INSTALL_DIR
45+
mkdir "$SITE_PACKAGES" -p
46+
cp -r "$SOURCE_DIR"/$SOURCE_NAME/tests "$SITE_PACKAGES"/
47+
export PYTHONPATH="$SITE_PACKAGES"
48+
python3 setup.py install --prefix="$INSTALL_DIR"
4949

50-
cd $SOURCE_DIR
51-
export PYTHONPATH=$PYTHONPATH:`ls | grep aliyun-python-sdk- | grep -v core | xargs | sed 's/ /:/g'`
50+
cd "$SOURCE_DIR"
51+
export PYTHONPATH="$PYTHONPATH":$(ls | grep aliyun-python-sdk- | grep -v core | xargs | sed 's/ /:/g')
5252
python3 -m pytest python-sdk-functional-test
5353
fi
5454

5555

56-
if [ $OPERATION == "release" ]; then
56+
if [ "$OPERATION" == "release" ]; then
5757
echo "releasing package"
58-
cd ${COPY_DIR}/${SOURCE_NAME}
58+
cd "${COPY_DIR}"/${SOURCE_NAME}
5959
twine upload dist/*
6060
fi

run_all_test.sh

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
#!/bin/bash
12

2-
export PYTHONPATH=$PYTHONPATH:`ls | grep aliyun-python-sdk- | xargs | sed 's/ /:/g'`
3-
for i in `ls | grep aliyun-python-sdk-`; do
4-
echo "Adding $i to PYTHONPATH ..."
5-
export PYTHONPATH=$PYTHONPATH:`pwd`/$i > /dev/null
3+
export PYTHONPATH="$PYTHONPATH":$(ls | grep aliyun-python-sdk- | xargs | sed 's/ /:/g')
4+
for i in $(ls | grep aliyun-python-sdk-); do
5+
# Add to PYTHONPATH
6+
export PYTHONPATH="$PYTHONPATH":$(pwd)/"$i" > /dev/null
67
done
78

89
coverage run -a --source="./aliyun-python-sdk-core/aliyunsdkcore" --branch -m pytest python-sdk-functional-test

0 commit comments

Comments
 (0)