diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2018-04-13 09:32:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-13 09:32:51 -0700 |
| commit | 0f4a2032b73104bb3715cbea6fad64ba31ef2fac (patch) | |
| tree | f080ec921ebe115b0585186c255a523a396d2307 | |
| parent | 12f1aa25fdca5347c104cd2bbb90c3db5a368d5c (diff) | |
| parent | 1418445b5e24788a38478888fee00c5e764a61e4 (diff) | |
Merge pull request #759 from ladyada/master
quoting paths
| -rwxr-xr-x | ports/nrf/drivers/bluetooth/download_ble_stack.sh | 24 | ||||
| -rw-r--r-- | py/mkrules.mk | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/ports/nrf/drivers/bluetooth/download_ble_stack.sh b/ports/nrf/drivers/bluetooth/download_ble_stack.sh index 799ffc214..87f54318c 100755 --- a/ports/nrf/drivers/bluetooth/download_ble_stack.sh +++ b/ports/nrf/drivers/bluetooth/download_ble_stack.sh @@ -8,8 +8,8 @@ function download_s132_nrf52_2_0_1 echo "####################################" echo "" - mkdir -p $1/s132_nrf52_2.0.1 - cd $1/s132_nrf52_2.0.1 + mkdir -p "${1}/s132_nrf52_2.0.1" + cd "${1}/s132_nrf52_2.0.1" wget https://www.nordicsemi.com/eng/nordic/download_resource/51479/6/84640562/95151 mv 95151 temp.zip unzip -u temp.zip @@ -25,8 +25,8 @@ function download_s132_nrf52_5_0_0 echo "####################################" echo "" - mkdir -p $1/s132_nrf52_5.0.0 - cd $1/s132_nrf52_5.0.0 + mkdir -p "${1}/s132_nrf52_5.0.0" + cd "${1}/s132_nrf52_5.0.0" wget http://www.nordicsemi.com/eng/nordic/download_resource/58987/11/7198220/116068 mv 116068 temp.zip @@ -43,8 +43,8 @@ function download_s140_nrf52_6_0_0_6_alpha echo "############################################" echo "" - mkdir -p $1/s140_nrf52_6.0.0-6.alpha - cd $1/s140_nrf52_6.0.0-6.alpha + mkdir -p "${1}/s140_nrf52_6.0.0-6.alpha" + cd "${1}/s140_nrf52_6.0.0-6.alpha" wget http://www.nordicsemi.com/eng/nordic/download_resource/60624/18/61756799/116072 mv 116072 temp.zip @@ -57,17 +57,17 @@ SCRIPT_DIR="$(cd -P "$(dirname "${BASH_SOURCE[0]}")" && pwd)" if [ $# -eq 0 ]; then echo "No Bluetooth LE stack defined, downloading all." - download_s132_nrf52_2_0_1 ${SCRIPT_DIR} - download_s132_nrf52_5_0_0 ${SCRIPT_DIR} - download_s140_nrf52_6_0_0_6_alpha ${SCRIPT_DIR} + download_s132_nrf52_2_0_1 "${SCRIPT_DIR}" + download_s132_nrf52_5_0_0 "${SCRIPT_DIR}" + download_s140_nrf52_6_0_0_6_alpha "${SCRIPT_DIR}" else case $1 in "s132_nrf52_2_0_1" ) - download_s132_nrf52_2_0_1 ${SCRIPT_DIR} ;; + download_s132_nrf52_2_0_1 "${SCRIPT_DIR}" ;; "s132_nrf52_5_0_0" ) - download_s132_nrf52_5_0_0 ${SCRIPT_DIR} ;; + download_s132_nrf52_5_0_0 "${SCRIPT_DIR}" ;; "s140_nrf52_6_0_0_6_alpha" ) - download_s140_nrf52_6_0_0_6_alpha ${SCRIPT_DIR} ;; + download_s140_nrf52_6_0_0_6_alpha "${SCRIPT_DIR}" ;; esac fi diff --git a/py/mkrules.mk b/py/mkrules.mk index 7385ad57a..ed66da64b 100644 --- a/py/mkrules.mk +++ b/py/mkrules.mk @@ -123,7 +123,7 @@ $(BUILD)/frozen_mpy: $(FROZEN_MPY_DIRS) $(Q)$(PREPROCESS_FROZEN_MODULES) -o $@ $(FROZEN_MPY_DIRS) $(Q)$(CD) $@ && \ $(FIND) -L . -type f -name '*.py' | sed 's=^\./==' | \ -xargs -n1 $(abspath $(MPY_CROSS)) $(MPY_CROSS_FLAGS) +xargs -n1 "$(abspath $(MPY_CROSS))" $(MPY_CROSS_FLAGS) # to build frozen_mpy.c from all .mpy files # You need to define MPY_TOOL_LONGINT_IMPL in mpconfigport.mk |