separate into own script instead

terrastruct · Oct 5, 2023 · 4b783e0 · 4b783e0
1 parent 232e4d5
commit 4b783e0
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/lib.sh b/lib.sh
@@ -29,6 +29,12 @@ ci_waitjobs() {
   return "$code"
 }
 #!/bin/sh
+set -eu
+cd -- "$(dirname "$0")/../lib"
+cd - >/dev/null
+
+ensure_signed
+#!/bin/sh
 if [ "${LIB_FLAG-}" ]; then
   return 0
 fi
@@ -322,11 +328,6 @@ nofixups() {
     return
   fi
 
-  if [ -n "${CHECK_SIGS-}" ]; then
-    if [ ! "$(ensure_signed)" ]; then
-      return 1
-    fi
-  fi
   commits="$(git log --grep='fixup!' --format=%h ${GIT_BASE:+"$GIT_BASE..HEAD"})"
   if [ -n "$commits" ]; then
     echo "$commits" | FGCOLOR=1 logpcat 'fixup detected'
@@ -335,6 +336,11 @@ nofixups() {
 }
 
 ensure_signed() {
+  ensure_git_base
+  if [ "$(git_commit_count)" -lt 1 ]; then
+    return
+  fi
+
   # look for signature status N: no signature
   if [ ! "$(git log --format="%G?" ${GIT_BASE:+"$GIT_BASE..HEAD"} | grep "N")" ]; then
     return

diff --git a/lib/ensure_signed.sh b/lib/ensure_signed.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -eu
+cd -- "$(dirname "$0")/../lib"
+. ./git.sh
+cd - >/dev/null
+
+ensure_signed
diff --git a/lib/git.sh b/lib/git.sh
@@ -164,11 +164,6 @@ nofixups() {
     return
   fi
 
-  if [ -n "${CHECK_SIGS-}" ]; then
-    if [ ! "$(ensure_signed)" ]; then
-      return 1
-    fi
-  fi
   commits="$(git log --grep='fixup!' --format=%h ${GIT_BASE:+"$GIT_BASE..HEAD"})"
   if [ -n "$commits" ]; then
     echo "$commits" | FGCOLOR=1 logpcat 'fixup detected'
@@ -177,6 +172,11 @@ nofixups() {
 }
 
 ensure_signed() {
+  ensure_git_base
+  if [ "$(git_commit_count)" -lt 1 ]; then
+    return
+  fi
+
   # look for signature status N: no signature
   if [ ! "$(git log --format="%G?" ${GIT_BASE:+"$GIT_BASE..HEAD"} | grep "N")" ]; then
     return