From 01ddd1b886ad089998c12a59ca2f5818af2516ec Mon Sep 17 00:00:00 2001
From: Russell Bryant <rbryant@redhat.com>
Date: Thu, 14 Mar 2024 11:35:22 -0400
Subject: [PATCH] generate: Genereate dir with commit ref included

Also actually allow --num-instructions as a valid arg.

Make sure we move off the pr branch before trying to delete it and
fetch a new pr branch.

Signed-off-by: Russell Bryant <rbryant@redhat.com>
---
 scripts/generate.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/generate.sh b/scripts/generate.sh
index 175317a4..6f655295 100755
--- a/scripts/generate.sh
+++ b/scripts/generate.sh
@@ -52,11 +52,12 @@ generate() {
     fi
     cd taxonomy || exit 1
     git fetch origin
+    git checkout main
     git branch -D "pr-${PR_ID}" 2>/dev/null
     git fetch origin "pull/${PR_ID}/head:pr-${PR_ID}"
     git checkout "pr-${PR_ID}"
+    OUTPUT_DIR="generate-pr-${PR_ID}-$(git rev-parse --short HEAD)"
     cd ..
-    OUTPUT_DIR="generate-pr-${PR_ID}"
     mkdir -p "$OUTPUT_DIR"
     lab generate --output-dir "$OUTPUT_DIR" --num-instructions "${NUM_INSTRUCTIONS}"
 }
@@ -68,6 +69,10 @@ while [ $# -gt 0 ]; do
             usage
             exit 0
             ;;
+        --num-instructions)
+            NUM_INSTRUCTIONS="$2"
+            shift
+            ;;
         --venv-dir)
             VENV_DIR="$2"
             shift