fix: detect catalog or markdown present

Signed-off-by: Lou DeGenaro <[email protected]>
oscal-compass · Nov 17, 2023 · bd714a7 · bd714a7
1 parent 10ebf4e
commit bd714a7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/scripts/automation/push.sh b/scripts/automation/push.sh
@@ -86,13 +86,11 @@ function err() {
     msg "$*" 1>&2
 }
 
-# If there is no catalog or markdown, then there is nothing to do
-COUNT_CATALOG_MD=$(ls -l md_catalogs | grep ^- | wc -l)
 COUNT_CATALOGS=$(ls -l catalogs | grep ^- | wc -l)
-let "INITIALIZED = $COUNT_CATALOG_MD + $COUNT_CATALOGS"
-if [ $INITIALIZED -eq 0 ]
+COUNT_CATALOG_MD=$(ls -l md_catalogs | grep ^- | wc -l)
+if [ "$COUNT_CATALOGS" == "0" ] || [ "$COUNT_CATALOG_MD" == "0" ]
 then
-	echo "push: no catalog or markdown, nothing to do"
+    echo "no catalog or markdown present -> nothing to do"
 else
 	github-branch-commit
 fi

diff --git a/scripts/automation/release.sh b/scripts/automation/release.sh
@@ -2,15 +2,13 @@
 
 source config.env
 
-# If there is no catalog or markdown, then there is nothing to do
-COUNT_CATALOG_MD=$(ls -l md_catalogs | grep ^- | wc -l)
 COUNT_CATALOGS=$(ls -l catalogs | grep ^- | wc -l)
-let "INITIALIZED = $COUNT_CATALOG_MD + $COUNT_CATALOGS"
-if [ $INITIALIZED -eq 0 ]
+COUNT_CATALOG_MD=$(ls -l md_catalogs | grep ^- | wc -l)
+if [ "$COUNT_CATALOGS" == "0" ] || [ "$COUNT_CATALOG_MD" == "0" ]
 then
-	echo "release: no catalog or markdown, nothing to do"
+    echo "no catalog or markdown present -> nothing to do"
 else
-	version_tag=$(semantic-release print-version)
+    version_tag=$(semantic-release print-version)
 	echo "Bumping version of catalogs to ${version_tag}" 
 	export VERSION_TAG="$version_tag"
 	echo "VERSION_TAG=${VERSION_TAG}" >> $GITHUB_ENV
@@ -24,4 +22,4 @@ else
 	git config --global user.email "$EMAIL"
 	git config --global user.name "$NAME" 
 	semantic-release publish
-fi
+fi