Revert "Allman now (#6080)" (#6090)

This reverts commit 98125f8860.

tests/restyle-all.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -e
+
+org=$(cd ${0%/*}; pwd)
+cd ${org}/..
+pwd
+test -d cores/esp8266
+test -d libraries
+
+# this warning question will be removed after restyle-all.sh is renamed to restyle.sh
+echo "This is dangerous if you have modified your local repository"
+echo "type iknowwhatido to continue"
+read ans
+test "$ans" = iknowwhatido || exit 1
+
+for d in cores/esp8266 libraries; do
+    for e in c cpp h; do
+        find $d -name "*.$e" -exec \
+            astyle \
+                --suffix=none \
+                --options=${org}/astyle_core.conf {} \;
+        done
+done
+
+for d in libraries; do
+    find $d -name "*.ino" -exec \
+        astyle \
+            --suffix=none \
+            --options=${org}/astyle_examples.conf {} \;
+done

tests/restyle-old.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -e
-
-org=$(cd ${0%/*}; pwd)
-cd ${org}/..
-pwd
-test -d cores/esp8266
-test -d libraries
-
-# in a near future, restyle-all.sh will be renamed to restyle.sh
-# and will be checked against CI
-
-for d in libraries; do
-	find $d -name "*.ino" -exec \
-	    astyle \
-	        --suffix=none \
-                --options=${org}/astyle_examples.conf {} \;
-done

tests/restyle.sh

@@ -8,18 +8,12 @@ pwd
 test -d cores/esp8266
 test -d libraries
 
-for d in cores/esp8266 libraries; do
-    for e in c cpp h; do
-        find $d -name "*.$e" -exec \
-            astyle \
-                --suffix=none \
-                --options=${org}/astyle_core.conf {} \;
-        done
-done
+# in a near future, restyle-all.sh will be renamed to restyle.sh
+# and will be checked against CI
 
 for d in libraries; do
-    find $d -name "*.ino" -exec \
-        astyle \
-            --suffix=none \
-            --options=${org}/astyle_examples.conf {} \;
+	find $d -name "*.ino" -exec \
+	    astyle \
+	        --suffix=none \
+                --options=${org}/astyle_examples.conf {} \;
 done