Commit a76f8a497250

Vincent Demeester <vincent@sbr.pm>
2025-11-19 22:00:37
feat(eyelash_corne): Support auto-mounted devices in flash script
- Eliminate manual mounting when system auto-mounts NICENANO - Improve flashing workflow on modern Linux distributions - Maintain backward compatibility with manual mount fallback Co-Authored-By: Claude <noreply@anthropic.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent 3f44036
Changed files (1)
keyboards/eyelash_corne.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 set -eufo pipefail
 
-cPWD="$(dirname $(readlink -f $0))"
-source ${cPWD}/lib/functions.sh
+cPWD="$(dirname "$(readlink -f "$0")")"
+# shellcheck disable=SC1091
+source "${cPWD}/lib/functions.sh"
 
 function build() {
 	docker build --target output_collector --output type=local,dest="firmwares" -f eyelash_corne/Dockerfile eyelash_corne
@@ -12,17 +13,21 @@ function flash() {
 	side=${1}
 	id=${2}
 
-	echo -n "$(echo_red ) Connect ${side} side as usb storage: "
-	while [[ ! -e /dev/disk/by-id/${id} ]]; do
+	echo -n "$(echo_red) Connect ${side} side as usb storage: "
+	while [[ ! -e /dev/disk/by-id/"${id}" ]]; do
 		echo -n "$(echo_blue .)"
 		sleep 1
 	done
 	echo " ✅"
-	sudo umount /mnt 2>/dev/null >/dev/null || true
-	sudo mount /dev/disk/by-id/${id} /mnt
-	sudo cp -bv firmwares/eyelash_corne_${side}.uf2 /mnt/CURRENT.UF2
-	sync
-	sudo umount /mnt
+
+	if [[ -d /run/media/"${USER}"/NICENANO ]]; then
+		echo "$(echo_green ) Using auto-mounted /run/media/${USER}/NICENANO"
+		cp -bv "firmwares/eyelash_corne_${side}.uf2" /run/media/"${USER}"/NICENANO/CURRENT.UF2
+	else
+		sudo umount /mnt 2>/dev/null >/dev/null || true
+		sudo mount /dev/disk/by-id/"${id}" /mnt
+		sudo cp -bv "firmwares/eyelash_corne_${side}.uf2" /mnt/CURRENT.UF2
+	fi
 }
 
 build
@@ -32,4 +37,4 @@ echo "$(echo_green ) Left side is completed.."
 sleep 2
 
 flash right usb-Adafruit_nRF_UF2_0E9CC2AD6581EE32-0:0
-echo $(echo_green ) "Right side is completed.. enjoy 🥳"
+echo "$(echo_green )" "Right side is completed.. enjoy 🥳"