From c07113320bbbcc47a82d385ff78108b8bbd6c38e Mon Sep 17 00:00:00 2001
From: David Boreham <david@bozemanpass.com>
Date: Wed, 19 Apr 2023 14:55:36 -0600
Subject: [PATCH 1/3] Fix build script (#351)

---
 .gitignore                    | 3 ++-
 scripts/build_shiv_package.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4b30a1d3..8ae2b229 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ laconic-so
 laconic_stack_orchestrator.egg-info
 __pycache__
 *~
-build
+package
+app/data/build_tag.txt
diff --git a/scripts/build_shiv_package.sh b/scripts/build_shiv_package.sh
index 3d0c12ff..c1841415 100755
--- a/scripts/build_shiv_package.sh
+++ b/scripts/build_shiv_package.sh
@@ -1,4 +1,4 @@
 # Builds the shiv "package" for distribution
 mkdir -p ./package
-version_string=$( ./app/data/version.txt )
+version_string=$( ./scripts/create_build_tag_file.sh )
 shiv -c laconic-so -o package/laconic-so-${version_string} .
-- 
2.45.2


From 5ef37894ce62aa40814ce9f97d21e87926cd3244 Mon Sep 17 00:00:00 2001
From: David Boreham <david@bozemanpass.com>
Date: Wed, 19 Apr 2023 15:16:34 -0600
Subject: [PATCH 2/3] Update setuptools in case the version on the machine is
 old (#352)

---
 scripts/developer-mode-setup.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/developer-mode-setup.sh b/scripts/developer-mode-setup.sh
index 997c6173..bd60a770 100755
--- a/scripts/developer-mode-setup.sh
+++ b/scripts/developer-mode-setup.sh
@@ -7,5 +7,6 @@ if [[ -n "$CERC_SCRIPT_DEBUG" ]]; then
 fi
 python3 -m venv venv
 source ./venv/bin/activate
-pip install --editable .
+python3 -m pip install --upgrade pip setuptools wheel
 pip install shiv
+pip install --editable .
-- 
2.45.2


From 2d9dda1ebf3e5b0c3eebcde885462b9de1213099 Mon Sep 17 00:00:00 2001
From: David Boreham <david@bozemanpass.com>
Date: Wed, 19 Apr 2023 15:29:02 -0600
Subject: [PATCH 3/3] Catch and report git errors

---
 app/setup_repositories.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/setup_repositories.py b/app/setup_repositories.py
index 6f148b87..e8c08916 100644
--- a/app/setup_repositories.py
+++ b/app/setup_repositories.py
@@ -175,4 +175,8 @@ def command(ctx, include, exclude, git_ssh, check_only, pull, branches_file):
                         git_repo.git.checkout(branch_to_checkout)
 
     for repo in repos:
-        process_repo(repo)
+        try:
+            process_repo(repo)
+        except git.exc.GitCommandError as error:
+            print(f"\n******* git command returned error exit status:\n{error}")
+            sys.exit(1)
-- 
2.45.2