diff --git a/backup.sh b/backup.sh index bf16c33..e44b45c 100755 --- a/backup.sh +++ b/backup.sh @@ -1,21 +1,20 @@ -#! /bin/bash +#!/bin/bash BKPPATH="firmware-backups" -mkdir -p $BKPPATH +mkdir -p "$BKPPATH" NOW=$(date +%s) -num=$(ls -l /dev/ttyACM* | rev | cut -c 1) -echo com is:$num -splitPorts=($num) +num=$(find /dev -name 'ttyACM*' | sort | rev | cut -c 1) +echo com is: "$num" +mapfile -t splitPorts <<< "$num" echo "This tool assumes your buds are the only thing connected and are enumerated {right,left} order. YMMV" echo "Right bud is at ${splitPorts[0]}" echo "Left bud is at ${splitPorts[1]}" echo "Please disconnect and reconnect the bud on the right" - -bestool read-image --port /dev/ttyACM${splitPorts[0]} $BKPPATH/firmware-$NOW-${splitPorts[0]}.bin.bkp +bestool read-image --port "/dev/ttyACM${splitPorts[0]}" "${BKPPATH}/firmware-${NOW}-${splitPorts[0]}.bin.bkp" echo "Please disconnect and reconnect the bud on the left" -bestool read-image --port /dev/ttyACM${splitPorts[1]} $BKPPATH/firmware-$NOW-${splitPorts[1]}.bin.bkp +bestool read-image --port "/dev/ttyACM${splitPorts[1]}" "${BKPPATH}/firmware-${NOW}-${splitPorts[1]}.bin.bkp" diff --git a/build.sh b/build.sh index 3211718..064cec6 100755 --- a/build.sh +++ b/build.sh @@ -1,10 +1,8 @@ -#!/bin/bash +#!/bin/sh -make -j T=open_source DEBUG=1 >log.txt 2>&1 - -if [ $? -eq 0 ]; then +if make -j "$(nproc)" T=open_source DEBUG=1 >log.txt 2>&1; then echo "build success" else echo "build failed and call log.txt" - cat log.txt | grep "error:*" + grep "error:" log.txt fi diff --git a/clear.sh b/clear.sh index 21a648d..f51df0a 100755 --- a/clear.sh +++ b/clear.sh @@ -1,2 +1,3 @@ -#!/bin/bash -make T=open_source -j DEBUG=1 clean +#!/bin/sh + +make -j "$(nproc)" T=open_source DEBUG=1 clean diff --git a/download.sh b/download.sh index 4b91953..7519f42 100755 --- a/download.sh +++ b/download.sh @@ -1,15 +1,14 @@ -#! /bin/bash +#!/bin/bash -num=$(ls -l /dev/ttyACM* | rev | cut -c 1) -echo com is:$num -splitPorts=($num) +num=$(find /dev -name 'ttyACM*' | sort | rev | cut -c 1) +echo com is: "$num" +mapfile -t splitPorts <<< "$num" echo "This tool assumes your buds are the only thing connected and are enumerated {right,left} order. YMMV" echo "Right bud is at ${splitPorts[0]}" echo "Left bud is at ${splitPorts[1]}" echo "Please disconnect and reconnect the bud on the right" - -bestool write-image out/open_source/open_source.bin --port /dev/ttyACM${splitPorts[0]} +bestool write-image out/open_source/open_source.bin --port "/dev/ttyACM${splitPorts[0]}" echo "Please disconnect and reconnect the bud on the left" -bestool write-image out/open_source/open_source.bin --port /dev/ttyACM${splitPorts[1]} +bestool write-image out/open_source/open_source.bin --port "/dev/ttyACM${splitPorts[1]}" diff --git a/uart_log.sh b/uart_log.sh index 1ce2513..93f16a0 100755 --- a/uart_log.sh +++ b/uart_log.sh @@ -1,6 +1,5 @@ -#! /bin/bash +#!/bin/sh -num=$(ls -l /dev/ttyUSB* | rev | cut -c 1) -#num=1 -echo $num -sudo minicom port$num +num=$(find /dev -name 'ttyUSB*' | rev | cut -c 1) +echo "$num" +sudo minicom "port$num"