2 files changed, 9 insertions, 10 deletions

diff --git a/util/travis_build.sh b/util/travis_build.sh
index d12a87a94..a25d871e2 100755
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -5,9 +5,9 @@
 
 TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}"
 TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
-MAKE_ALL="make all:default AUTOGEN=\"true\""
+MAKE_ALL="make all:default"
 
-if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then 
+if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
         exit_code=0
         git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE}
         if [ $? -eq 128 ]; then
@@ -30,15 +30,15 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
                                 KEYMAP_ONLY=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/'${KB}'/keymaps/)' | wc -l)
                                 if [[ $KEYMAP_ONLY -gt 0 ]]; then
                                         echo "Making all keymaps for $KB"
-                                        make ${KB}:all AUTOGEN=true
+                                        make ${KB}:all
                                         : $((exit_code = $exit_code + $?))
                                 else
                                         MKM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards/'${KB}'/keymaps/)([a-zA-Z0-9_]+)(?=\/)' | sort -u)
                                         for KM in $MKM ; do
-                                                echo "Making $KM for $KB"       
-                                                make ${KB}:${KM} AUTOGEN=true
+                                                echo "Making $KM for $KB"
+                                                make ${KB}:${KM}
                                                 : $((exit_code = $exit_code + $?))
-                                        done            
+                                        done
                                 fi
                         done
                 fi
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 66b3beb6c..155a9a8d2 100755
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -69,10 +69,9 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
         # rm -f compiled/*.hex
 
         # ignore errors here
-        for file in ../qmk_firmware/keyboards/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
-        for file in ../qmk_firmware/keyboards/*/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
-        for file in ../qmk_firmware/keyboards/*/*/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
-        for file in ../qmk_firmware/keyboards/*/*/*/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
+  # In theory, this is more flexible, and will allow for additional expansion of additional types of files and other names
+  mv -t compiled ../qmk_firmware/*_default.*(hex|bin) || true
+
         bash _util/generate_keyboard_page.sh
         git add -A
         git commit -m "generated from qmk/qmk_firmware@${rev}"