wip

Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>

bootstrap.sh

@@ -57,16 +57,13 @@ mkdir -p "${DEST_DIR}"
 
 pushd "${DEST_DIR}" > /dev/null
 
-# If the destination directory is not part of a git repository, git init
+# If the destination directory is not part of a git repository, fail
 if [ ! -d .git ]; then
-  git init --initial-branch=main
-  echo "_bin" > .gitignore
-  git add .
-  git commit -m "Initial commit"
-  git tag --annotate --message="Initial release" v0.0.0 
+  echo "The destination directory is not a git repository. Please initialize a git repository before running this script."
+  exit 1
 fi
 
-bootstrap_hash="140169ff41d87878ddb0fdfd5ecf567aee25d992"
+bootstrap_hash="652f41ca2a789690977902191af89b423482853f"
 
 # Download the makefile
 curl -sSL https://raw.githubusercontent.com/cert-manager/makefile-modules/${bootstrap_hash}/modules/repository-base/base/Makefile -o Makefile

modules/help/help.sh

@@ -71,6 +71,7 @@ done <<< "$raw_expansions"
 
 ## 3. Sort and print the extracted line items
 
+: "${TERM:=xterm}"
 RULE_COLOR="$(tput setaf 6)"
 CATEGORY_COLOR="$(tput setaf 3)"
 CLEAR_STYLE="$(tput sgr0)"

modules/kind/00_kind_image_versions.mk

@@ -1,4 +1,4 @@
-# +skip_license_check 
+# +skip_license_check
 
 # This file is auto-generated by the learn_tools_shas.kind_images.sh script.
 # Do not edit manually.

scripts/learn_kind_images.sh

@@ -73,7 +73,7 @@ if ! $force && grep -q "kind_image_kindversion := ${kind_version}" "${kind_versi
 fi
 
 cat << EOF >> "${kind_versionfile}.tmp"
-# +skip_license_check 
+# +skip_license_check
 
 # This file is auto-generated by the learn_tools_shas.kind_images.sh script.
 # Do not edit manually.

tests/test_e2e.sh

@@ -37,6 +37,17 @@ for project in "${script_dir}"/e2e-projects/*; do
     tmp_dir=$(mktemp -d)
     trap '{ rm -rf "$tmp_dir"; echo "> Deleted temp dir $tmp_dir"; }' EXIT
 
+    # Initialize the git repository
+    pushd "${tmp_dir}" > /dev/null
+    git init --initial-branch=main
+    git config --local user.name "e2e tester"
+    git config --local user.email "test@cert-manager.io"
+    echo "_bin" > .gitignore
+    git add .
+    git commit -m "Initial commit"
+    git tag --annotate --message="Initial release" v0.0.0
+    popd > /dev/null
+
     # Run the bootstrap script
     "${script_dir}/../bootstrap.sh" "${tmp_dir}" "empty"