Skip to content

Commit ba934d4

Browse files
committed
code review fix
1 parent 8ba2f8c commit ba934d4

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

debian/arduino-app-cli/DEBIAN/prerm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22

33
systemctl disable arduino-app-cli
44
systemctl disable arduino-burn-bootloader
5+
systemctl disable arduino-avahi-serial.service

debian/arduino-app-cli/etc/systemd/system/arduino-avahi-serial.service

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[Unit]
22
Description=Configure Avahi with board serial number
33
Before=avahi-daemon.service
4-
ConditionPathExists=!/var/lib/arduino/avahi_serial_configured.flag
4+
ConditionPathExists=!/var/lib/arduino-app-cli/avahi_serial_configured.flag
55

66
[Service]
77
Type=oneshot
88
RemainAfterExit=true
9-
ExecStart=/usr/sbin/arduino-avahi-serial.sh
10-
ExecStartPost=/bin/mkdir -p /var/lib/arduino
11-
ExecStartPost=/bin/touch /var/lib/arduino/avahi_serial_configured.flag
9+
ExecStart=/usr/local/bin/arduino-avahi-serial.sh
10+
ExecStartPost=/bin/mkdir -p /var/lib/arduino-app-cli
11+
ExecStartPost=/bin/touch /var/lib/arduino-app-cli/avahi_serial_configured.flag
1212

1313
StandardOutput=journal
1414
StandardError=journal

debian/arduino-app-cli/usr/sbin/arduino-avahi-serial.sh renamed to debian/arduino-app-cli/usr/local/bin/arduino-avahi-serial.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,13 @@ if [ -z "$SERIAL_NUMBER" ]; then
2626
exit 1
2727
fi
2828

29-
if grep -q "serial_number=${SERIAL_NUMBER}" "$TARGET_FILE"; then
29+
if grep -q "serial_number=" "$TARGET_FILE"; then
3030
echo "Serial number ($SERIAL_NUMBER) already configured. Skipping."
3131
exit 0
3232
fi
3333

34-
NEW_LINE=" <txt-record>serial_number=${SERIAL_NUMBER}</txt-record>"
35-
3634
echo "Adding serial number to $TARGET_FILE..."
37-
38-
sed -i "\#${MARKER_LINE}#i ${NEW_LINE}" "$TARGET_FILE"
35+
sed -i "/<\/service>/i <txt-record>serial_number=${SERIAL_NUMBER}<\/txt-record>" "$TARGET_FILE"
3936

4037
echo "Avahi configuration attempt finished."
4138
exit 0

0 commit comments

Comments
 (0)