From 3cf6c47bab231736292a57c0cb756f89a3ba960e Mon Sep 17 00:00:00 2001 From: Jorropo Date: Fri, 29 Mar 2024 07:01:40 +0100 Subject: [PATCH] replace arch with uname -m for arch linux (#3508) From the manpage: > arch - print machine hardware name (same as uname -m) Arch Linux does not have the `arch` alias, only `uname`, so use `uname` to fix this issue: > ``` > ./bin/build-native.sh: line 18: arch: command not found > ``` Co-authored-by: Jonathan Bennett --- bin/build-native.sh | 2 +- bin/native-install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/build-native.sh b/bin/build-native.sh index 7e9fcb632..7065ea54f 100755 --- a/bin/build-native.sh +++ b/bin/build-native.sh @@ -15,6 +15,6 @@ rm -r $OUTDIR/* || true # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale platformio pkg update pio run --environment native -cp .pio/build/native/program "$OUTDIR/meshtasticd_linux_$(arch)" +cp .pio/build/native/program "$OUTDIR/meshtasticd_linux_$(uname -m)" cp bin/device-install.* $OUTDIR cp bin/device-update.* $OUTDIR diff --git a/bin/native-install.sh b/bin/native-install.sh index cc6d968f9..ba71c4f46 100755 --- a/bin/native-install.sh +++ b/bin/native-install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -cp "release/meshtasticd_linux_$(arch)" /usr/sbin/meshtasticd +cp "release/meshtasticd_linux_$(uname -m)" /usr/sbin/meshtasticd mkdir /etc/meshtasticd if [[ -f "/etc/meshtasticd/config.yaml" ]]; then cp bin/config-dist.yaml /etc/meshtasticd/config-upgrade.yaml