diff --git a/make_rootfs/rootfsimg_linux.sh b/make_rootfs/rootfsimg_linux.sh index 7c2308f..f3eed24 100755 --- a/make_rootfs/rootfsimg_linux.sh +++ b/make_rootfs/rootfsimg_linux.sh @@ -99,7 +99,7 @@ elif [ "${FSTYPE}" = "ext4" ]; then EMMC_ROOTFS_SIZE=50 fi fi - COUNT_SIZE=`expr $EMMC_ROOTFS_SIZE \* 1024 \* 2` + COUNT_SIZE="$(expr ${EMMC_ROOTFS_SIZE} \* 1024 \* 2)" dd if=/dev/zero of=${ROOTFS_IMG} bs=512 count=${COUNT_SIZE} ${EXT4_TOOL} ${ROOTFS_IMG} ${EXT4_SH} ${ROOTFS_DIR} ${ROOTFS_IMG} ${CONFIG_PATH} diff --git a/run_shell_cmd.py b/run_shell_cmd.py index 2acf157..7a3ca23 100755 --- a/run_shell_cmd.py +++ b/run_shell_cmd.py @@ -15,12 +15,12 @@ # limitations under the License. # -import os +import subprocess import sys def main(): - return os.WEXITSTATUS(os.system(' '.join(sys.argv[1:]))) + return subprocess.Popen(' '.join(sys.argv[1:]),shell=True).wait() if __name__ == '__main__': diff --git a/setup.py b/setup.py index 3c04838..9dcce82 100755 --- a/setup.py +++ b/setup.py @@ -21,9 +21,11 @@ from setuptools import setup from hb.__main__ import VERSION +LONG_DESCRIPTION = "" WORK_PATH = os.path.abspath(os.path.dirname('__file__')) README_PATH = os.path.join(WORK_PATH, 'README.md') -LONG_DESCRIPTION = open(README_PATH, 'r', encoding='utf-8').read() +with open(README_PATH, 'r', encoding='utf-8') as FILE_DESCRIPTION: + LONG_DESCRIPTION = FILE_DESCRIPTION.read() setup( name='ohos-build',