diff options
| author | visilya <84504499+visilya@users.noreply.github.com> | 2023-04-07 19:32:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-07 12:32:23 -0400 |
| commit | 8850084fcf001c496d160985999a76f74a13ef44 (patch) | |
| tree | 53d3e948f18610b2553b861c304579a1f661844f | |
| parent | e5ed245ff2cc04f80fa248c18ea18535cc06e553 (diff) | |
| download | kutter-8850084fcf001c496d160985999a76f74a13ef44.tar.gz kutter-8850084fcf001c496d160985999a76f74a13ef44.tar.xz kutter-8850084fcf001c496d160985999a76f74a13ef44.zip | |
scripts: Fix flash linux when OUT argument provided (#6133)
Signed-off-by: Ilya Vislotsky <write2ilya@gmail.com>
| -rwxr-xr-x | scripts/flash-linux.sh | 9 | ||||
| -rw-r--r-- | src/linux/Makefile | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/scripts/flash-linux.sh b/scripts/flash-linux.sh index cc808aa8..bd3b4f63 100755 --- a/scripts/flash-linux.sh +++ b/scripts/flash-linux.sh @@ -7,10 +7,17 @@ if [ "$EUID" -ne 0 ]; then fi set -e +# Setting build output directory +if [ -z "${1}" ]; then + out='out' +else + out=${1} +fi + # Install new micro-controller code echo "Installing micro-controller code to /usr/local/bin/" rm -f /usr/local/bin/klipper_mcu -cp out/klipper.elf /usr/local/bin/klipper_mcu +cp ${out}/klipper.elf /usr/local/bin/klipper_mcu sync # Restart (if system install script present) diff --git a/src/linux/Makefile b/src/linux/Makefile index f234c3af..7c1de7c1 100644 --- a/src/linux/Makefile +++ b/src/linux/Makefile @@ -11,4 +11,4 @@ CFLAGS_klipper.elf += -lutil -lrt -lpthread flash: $(OUT)klipper.elf @echo " Flashing" - $(Q)sudo ./scripts/flash-linux.sh + $(Q)sudo ./scripts/flash-linux.sh $(OUT) |