Merge pull request #1813 from umarcor/dev-cleanup

dev scripts should not depend on ci scripts

Author: vaughnbetz

dev/check-format-py.sh

@@ -1,35 +1,3 @@
 #!/usr/bin/env bash
 
-source $(dirname "$0")/../.github/scripts/common.sh
-
-clean=$(git status -s -uno | wc -l) #Short ignore untracked
-
-if [ $clean -ne 0 ]; then
-    echo "Current working tree was not clean! This tool only works on clean checkouts"
-    exit 2
-else
-    echo "Code Formatting Check"
-    echo "====================="
-    make format-py > /dev/null 2>&1
-
-    valid_format=$(git diff | wc -l)
-
-    if [ $valid_format -ne 0 ]; then
-        echo "FAILED"
-        echo ""
-        echo "You *must* make the following changes to match the formatting style"
-        echo "-------------------------------------------------------------------"
-        echo ""
-
-        git diff
-
-        echo ""
-        echo "Run 'make format-py' to apply these changes"
-
-        git reset --hard > /dev/null
-        exit 1
-    else
-        echo "OK"
-    fi
-fi
-exit 0
+$(dirname "$0")/check-format.sh -py

dev/check-format.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-source $(dirname "$0")/../.github/scripts/common.sh
-
 clean=$(git status -s -uno | wc -l) #Short ignore untracked
 
 if [ $clean -ne 0 ]; then
@@ -10,7 +8,7 @@ if [ $clean -ne 0 ]; then
 else
     echo "Code Formatting Check"
     echo "====================="
-    make format > /dev/null
+    make format"$1" > /dev/null 2>&1
 
     valid_format=$(git diff | wc -l)
 
@@ -24,7 +22,7 @@ else
         git diff
 
         echo ""
-        echo "Run 'make format' to apply these changes"
+        echo "Run 'make format$1' to apply these changes"
 
         git reset --hard > /dev/null
         exit 1