Generate bash_completion file with make, not bootstrap

cinderblock · cinderblock · commit d08f2efabc13 · 2022-10-24T13:06:36.000-07:00
diff --git a/Makefile.am b/Makefile.am
@@ -1,5 +1,12 @@
 SUBDIRS = src docs
 
+dfu_programmer: dfu_completion update-bash-completion.sh src/arguments.c
+	./update-bash-completion.sh
+
+bash-completion: dfu_programmer
+.PHONY: bash-completion
+all: bash-completion
+
 EXTRA_DIST = bootstrap.sh dfu_completion \
              fedora/10-dfu-programmer.fdi \
              fedora/dfu-programmer.spec
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -8,37 +8,3 @@ aclocal -I m4
 autoheader
 automake --foreign --add-missing --force-missing
 autoconf
-
-set +x # Disable echoing of commands
-
-if [ "$(echo `uname`)" = "Linux" ]; then
-    TARGET_START_LINE=$( grep START_TARGET_LIST_LINE -n src/arguments.c  | \
-                            sed "s/^\(.*\):.*/\1/")
-    TARGET_END_LINE=$( grep END_TARGET_LIST_LINE -n src/arguments.c | \
-                            sed "s/^\(.*\):.*/\1/")
-    TARGET_INFO=$( sed -n "$TARGET_START_LINE,$TARGET_END_LINE p" src/arguments.c | \
-      grep "^\s*{ \"" | sed 's/.*"\(.*\)".*,\s*\([xX0-9A-Fa-f]*\)\s*},/\1::\2/' )
-
-    DFU_COMP=dfu_programmer
-
-    echo \#\ autocomplete\ script > $DFU_COMP
-    echo "# code sourced from dfu_completion, DO NOT EDIT IN THIS FILE" \
-        >> $DFU_COMP
-    echo >> $DFU_COMP
-    echo -n "TARGET_INFO=\" " >> $DFU_COMP
-    echo -n $TARGET_INFO >> $DFU_COMP
-    echo " \"" >> $DFU_COMP
-    echo >> $DFU_COMP
-    echo >> $DFU_COMP
-
-    cat dfu_completion >> $DFU_COMP
-
-    chmod +x $DFU_COMP
-
-    #if [ "$(cat /etc/*release | grep DISTRIB_ID | sed 's/DISTRIB_ID=//')" = "Ubuntu" ]]; then
-    echo "To install tab completion run"
-    echo " \$ sudo mv $DFU_COMP /etc/bash_completion.d/"
-    #fi
-    echo "To use tab completion in this terminal run"
-    echo " \$ source $DFU_COMP"
-fi
diff --git a/update-bash-completion.sh b/update-bash-completion.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# sed - without printing by default (-n)
+# Remove lines up to and including the start line, which includes: START_TARGET_LIST_LINE
+# Remove lines after and including the end line, which includes: END_TARGET_LIST_LINE
+# Get the part between the quotes and the last number
+TARGET_INFO=$( sed -n '1,/START_TARGET_LIST_LINE/d; /END_TARGET_LIST_LINE/,$d; s/.*"\(.*\)".*,\s*\([xX0-9A-Fa-f]*\)\s*},/\1::\2/p' src/arguments.c )
+
+# Output file
+DFU_COMP=dfu_programmer
+
+# Write the header with the TARGET_INFO
+cat << EOF > $DFU_COMP
+# autocomplete script
+# code sourced from \`dfu_completion\`
+# DO NOT EDIT IN THIS FILE
+
+TARGET_INFO="$TARGET_INFO"
+
+EOF
+
+# Remove everything up to and including the first empty line
+sed 1,/^\$/d dfu_completion >> $DFU_COMP
+
+chmod +x $DFU_COMP
+
+#if [ "$(cat /etc/*release | grep DISTRIB_ID | sed 's/DISTRIB_ID=//')" = "Ubuntu" ]]; then
+echo "To install tab completion run"
+echo " \$ sudo mv $DFU_COMP /etc/bash_completion.d/"
+#fi
+echo "To use tab completion in this terminal run"
+echo " \$ source $DFU_COMP"
