adding new script to commit changes (if present), and removing that c…

…ode from other scripts

.github/workflows/auto-format.yml

@@ -26,18 +26,15 @@ jobs:
         run: |
           pip install -r requirements_test.txt
 
-      - name: Code formatting and committing changes
+      - name: Updating README files
         run: |
-          sh scripts/auto-format-commit.sh
+          sh scripts/update-readme.sh
+          sh scripts/auto-commit.sh "Updating README files"
 
-      - name: Print github.ref
+      - name: Code formatting and committing changes
         run: |
-          echo "github.ref:"
-          echo ${{ github.ref }}
-          echo "git branch:"
-          git branch
-          echo "github.head_ref"
-          echo ${{ github.head_ref }}
+          sh scripts/auto-format-commit.sh
+          sh scripts/auto-commit.sh "Automated formatting changes"
 
       - name: Push changes
         uses: ad-m/github-push-action@master

scripts/auto-format-commit.sh → scripts/auto-commit.sh

@@ -1,15 +1,11 @@
 #!/bin/sh
 
-echo "Updating README files:"
-# Update version number in README files:
-scripts/update_version_readme.sh
-# Update README.tex.md
-scripts/update_readme.tex.md.sh
+COMMITMSG=$1
 
-# Code formatting with isort and black
-echo "Code formatting with isort and black:"
-isort $(git ls-files '*.py')
-black $(git ls-files '*.py')
+if [ -z $COMMITMSG ]; then
+	COMMITMSG="Automated formatting changes"
+fi
+echo "COMMITMSG: $COMMITMSG"
 
 # Stage changes
 #git add $(git ls-files)
@@ -24,8 +20,8 @@ else
 	echo "Changes found. Preparing commit."
 	git config --local user.email "github-actions[bot]@users.noreply.github.com"
 	git config --local user.name "github-actions[bot]"
-	git commit -m "Automated formatting changes"
+	git commit -m "${COMMITMSG}"
 fi
 
 git log | head
-exit 0
+exit 0

scripts/auto-format.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# Code formatting with isort and black
+echo "Code formatting with isort and black:"
+isort $(git ls-files '*.py')
+black $(git ls-files '*.py')
+
+## Stage changes
+##git add $(git ls-files)
+#git add --udpate
+#
+## Check Git diff-index
+#git diff-index --quiet HEAD --
+#
+#if [ $? -eq 0 ]; then
+#	echo "No changes found, nothing to see/do here."
+#else
+#	echo "Changes found. Preparing commit."
+#	git config --local user.email "github-actions[bot]@users.noreply.github.com"
+#	git config --local user.name "github-actions[bot]"
+#	git commit -m "Automated formatting changes"
+#fi
+#
+#git log | head
+#exit 0

scripts/update_readme.sh → scripts/update-readme.sh

@@ -38,5 +38,6 @@ update_readme_tex() {
 }
 
 # Update both readme files:
+echo "Updating README files:"
 update_version_readme "README.md"
-update_readme_tex "README.tex.md"
+update_readme_tex "README.tex.md"