From 55bb263a12ad798326fd82c59ca7e1c119b0888b Mon Sep 17 00:00:00 2001 From: Dorota Czaplejewicz Date: Fri, 27 Sep 2019 13:27:30 +0000 Subject: [PATCH 1/3] build: Fix script path detection --- cargo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cargo.sh b/cargo.sh index 8a68bc11..cc7ed165 100755 --- a/cargo.sh +++ b/cargo.sh @@ -7,7 +7,7 @@ set -e SCRIPT_PATH=`realpath $0` -SOURCE_DIR=`dirname $0` +SOURCE_DIR=`dirname $SCRIPT_PATH` export CARGO_TARGET_DIR=`pwd` if [ ! -z ${1} ]; then From 7aff7977fc4d2c4a0ad978df199cfee30a186393 Mon Sep 17 00:00:00 2001 From: Dorota Czaplejewicz Date: Fri, 27 Sep 2019 13:47:04 +0000 Subject: [PATCH 2/3] build: Remove empty variable from cargo.sh --- cargo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cargo.sh b/cargo.sh index cc7ed165..4836d374 100755 --- a/cargo.sh +++ b/cargo.sh @@ -16,7 +16,7 @@ fi cd $SOURCE_DIR shift -cargo $BUILD_ARG $@ +cargo $@ if [ ! -z ${OUT_PATH} ]; then cp "${CARGO_TARGET_DIR}"/debug/librs.a "${OUT_PATH}" From 0985724b19f273f14a32ba4dba0217a32cbab3f3 Mon Sep 17 00:00:00 2001 From: Dorota Czaplejewicz Date: Fri, 27 Sep 2019 13:47:49 +0000 Subject: [PATCH 3/3] shellcheck: Pass cargo.sh --- cargo.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/cargo.sh b/cargo.sh index 4836d374..ef4da1f6 100755 --- a/cargo.sh +++ b/cargo.sh @@ -6,18 +6,19 @@ set -e -SCRIPT_PATH=`realpath $0` -SOURCE_DIR=`dirname $SCRIPT_PATH` +SCRIPT_PATH="$(realpath "$0")" +SOURCE_DIR="$(dirname "$SCRIPT_PATH")" -export CARGO_TARGET_DIR=`pwd` -if [ ! -z ${1} ]; then - OUT_PATH=`realpath "${1}"` +CARGO_TARGET_DIR="$(pwd)" +export CARGO_TARGET_DIR +if [ -n "${1}" ]; then + OUT_PATH="$(realpath "$1")" fi -cd $SOURCE_DIR +cd "$SOURCE_DIR" shift -cargo $@ +cargo "$@" -if [ ! -z ${OUT_PATH} ]; then +if [ -n "${OUT_PATH}" ]; then cp "${CARGO_TARGET_DIR}"/debug/librs.a "${OUT_PATH}" fi