Merge remote-tracking branch 'origin/master' into develop

qmk-bot · qmk-bot · commit e45a2af68333 · 2021-01-01T18:09:02.000Z
diff --git a/util/list_keyboards.sh b/util/list_keyboards.sh
@@ -3,8 +3,6 @@
 #
 # This allows us to exclude keyboards by including a .noci file.
 
-find -L keyboards -type f -name rules.mk | grep -v keymaps | while read keyboard; do
-	keyboard=$(echo $keyboard | sed 's!keyboards/\(.*\)/rules.mk!\1!')
-
+find -L keyboards -type f -name rules.mk | grep -v keymaps | sed 's!keyboards/\(.*\)/rules.mk!\1!' | while read keyboard; do
 	[ "$1" = "noci" -a -e "keyboards/${keyboard}/.noci" ] || echo "$keyboard"
 done

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`#`
`4`	`4`	`# This allows us to exclude keyboards by including a .noci file.`
`5`	`5`
`6`		`-find -L keyboards -type f -name rules.mk \| grep -v keymaps \| while read keyboard; do`
`7`		`- keyboard=$(echo $keyboard \| sed 's!keyboards/\(.*\)/rules.mk!\1!')`
`8`		`-`
	`6`	`+find -L keyboards -type f -name rules.mk \| grep -v keymaps \| sed 's!keyboards/\(.*\)/rules.mk!\1!' \| while read keyboard; do`
`9`	`7`	`[ "$1" = "noci" -a -e "keyboards/${keyboard}/.noci" ] \|\| echo "$keyboard"`
`10`	`8`	`done`