Repository: incubator-mynewt-core Updated Branches: refs/heads/develop a25c4fe30 -> 605317587
This closes #195. Bring in utzig's fix to missing filename printing with openocd. Duplicate it to jlink user. Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/60531758 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/60531758 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/60531758 Branch: refs/heads/develop Commit: 60531758733aaf05a7b8c860fc99a4ba5f17fd23 Parents: a25c4fe Author: Marko Kiiskila <[email protected]> Authored: Thu Mar 9 15:14:22 2017 -0800 Committer: Marko Kiiskila <[email protected]> Committed: Thu Mar 9 15:14:22 2017 -0800 ---------------------------------------------------------------------- hw/scripts/jlink.sh | 6 ++++-- hw/scripts/openocd.sh | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/60531758/hw/scripts/jlink.sh ---------------------------------------------------------------------- diff --git a/hw/scripts/jlink.sh b/hw/scripts/jlink.sh index 26583dc..e6a4dfe 100644 --- a/hw/scripts/jlink.sh +++ b/hw/scripts/jlink.sh @@ -40,8 +40,10 @@ jlink_load () { exit 1 fi if [ ! -f "$FILE_NAME" ]; then - echo "Cannot find file" $FILE_NAME - exit 1 + # tries stripping current path for readability + FILE=${FILE_NAME##$(pwd)/} + echo "Cannot find file" $FILE + exit 1 fi if [ -z $FLASH_OFFSET ]; then echo "Missing flash offset" http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/60531758/hw/scripts/openocd.sh ---------------------------------------------------------------------- diff --git a/hw/scripts/openocd.sh b/hw/scripts/openocd.sh index 8caf3eb..46063a6 100644 --- a/hw/scripts/openocd.sh +++ b/hw/scripts/openocd.sh @@ -35,6 +35,8 @@ openocd_load () { exit 1 fi if [ ! -f "$FILE_NAME" ]; then + # tries stripping current path for readability + FILE=${FILE_NAME##$(pwd)/} echo "Cannot find file" $FILE exit 1 fi
