From d05b23941d34791a6b9ea38b608a7183c705e80c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 20 Aug 2018 20:52:25 -0500
Subject: [PATCH] Tweak env build test scripts

---
 buildroot/bin/env_backup  | 18 ++++--------------
 buildroot/bin/env_clean   | 28 ++++++----------------------
 buildroot/bin/env_restore | 14 +++++---------
 3 files changed, 15 insertions(+), 45 deletions(-)

diff --git a/buildroot/bin/env_backup b/buildroot/bin/env_backup
index b41a452a4c..164582de60 100755
--- a/buildroot/bin/env_backup
+++ b/buildroot/bin/env_backup
@@ -1,24 +1,14 @@
 #!/usr/bin/env bash
 
-if [ ! -z "$1" ]; then
-    cd $1
-fi
+[ -z "$1" ] || cd $1
 
 if [ -d ".test" ]; then
   printf "\033[0;31mEnvironment backup already exists!\033[0m\n"
 else
   mkdir .test
-  cp Marlin/Configuration.h .test/Configuration.h
-  cp Marlin/Configuration_adv.h .test/Configuration_adv.h
-
-  if [ -f Marlin/_Bootscreen.h ]; then
-    cp Marlin/_Bootscreen.h .test/_Bootscreen.h
-  fi
-
-  if [ -f Marlin/_Statusscreen.h ]; then
-    cp Marlin/_Statusscreen.h .test/_Statusscreen.h
-  fi
-
+  cp Marlin/Configuration*.h .test/
+  [ -f Marlin/_Bootscreen.h ] && cp Marlin/_Bootscreen.h .test/
+  [ -f Marlin/_Statusscreen.h ] && cp Marlin/_Statusscreen.h .test/
   cp -r Marlin/src/pins .test/pins
   printf "\033[0;32mEnvironment Backup created\033[0m\n"
 fi
diff --git a/buildroot/bin/env_clean b/buildroot/bin/env_clean
index 50b22e92f7..bb05e27bd4 100755
--- a/buildroot/bin/env_clean
+++ b/buildroot/bin/env_clean
@@ -1,29 +1,13 @@
 #!/usr/bin/env bash
 
-if [ -d ".pioenvs" ]; then
-  rm -r .pioenvs
-fi
-
-if [ -d ".piolibdeps" ]; then
-  rm -r .piolibdeps
-fi
-
-if [ -d ".piolib" ]; then
-  rm -r .piolib
-fi
+[ -d ".pioenvs" ] && rm -r .pioenvs
+[ -d ".piolibdeps" ] && rm -r .piolibdeps
+[ -d ".piolib" ] && rm -r .piolib
 
 if [ ! -z "$1" ]; then
   if [ $1 = "--deep" ]; then
-    if [ -d "~/.platformio/packages" ]; then
-      rm -r ~/.platformio/packages/*
-    fi
-
-    if [ -d "~/.platformio/platforms" ]; then
-      rm -r ~/.platformio/platforms/*
-    fi
-
-    if [ -d "~/.platformio/.cache" ]; then
-      rm -r ~/.platformio/.cache/*
-    fi
+    [ -d "~/.platformio/packages" ] && rm -r ~/.platformio/packages/*
+    [ -d "~/.platformio/platforms" ] && rm -r ~/.platformio/platforms/*
+    [ -d "~/.platformio/.cache" ] && rm -r ~/.platformio/.cache/*
   fi
 fi
diff --git a/buildroot/bin/env_restore b/buildroot/bin/env_restore
index 22bef325d6..defc6d8431 100755
--- a/buildroot/bin/env_restore
+++ b/buildroot/bin/env_restore
@@ -1,22 +1,18 @@
 #!/usr/bin/env bash
 
-if [ ! -z "$1" ]; then
-    cd $1
-fi
+[ -z "$1" ] || cd $1
 
 if [ -d ".test" ]; then
-  cp .test/Configuration.h Marlin/Configuration.h
-  cp .test/Configuration_adv.h Marlin/Configuration_adv.h
-  rm .test/Configuration.h
-  rm .test/Configuration_adv.h
+  cp .test/Configuration*.h Marlin/
+  rm .test/Configuration*.h
 
   if [ -f .test/_Bootscreen.h ]; then
-    cp .test/_Bootscreen.h Marlin/_Bootscreen.h
+    cp .test/_Bootscreen.h Marlin/
     rm .test/_Bootscreen.h
   fi
 
   if [ -f .test/_Statusscreen.h ]; then
-    cp .test/_Statusscreen.h Marlin/_Statusscreen.h
+    cp .test/_Statusscreen.h Marlin/
     rm .test/_Statusscreen.h
   fi