From 8e34ba907c3c37d5181df9acb8ae68b34ef31541 Mon Sep 17 00:00:00 2001
From: Camden Narzt <c.narzt@me.com>
Date: Sun, 21 Jul 2024 11:01:01 -0600
Subject: [PATCH] el8 changes

---
 integration/test/test.sh                         | 2 +-
 linux/docker_image/build_stages/essentials.sh    | 2 +-
 linux/docker_image/build_stages/install_s3cmd.sh | 2 +-
 linux/docker_image/support/s3cmd_wrapper.sh      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/integration/test/test.sh b/integration/test/test.sh
index 843aa4d..f4a5b00 100755
--- a/integration/test/test.sh
+++ b/integration/test/test.sh
@@ -38,7 +38,7 @@ fi
 
 # Sleep for a random amount of time in order to work around Docker/AUFS bugs
 # that may be triggered if multiple containers are shut down at the same time.
-echo 'import random, time; time.sleep(random.random() * 4)' | python
+echo 'import random, time; time.sleep(random.random() * 4)' | python2
 
 run rm -rf "$WORKSPACE/output"
 
diff --git a/linux/docker_image/build_stages/essentials.sh b/linux/docker_image/build_stages/essentials.sh
index f27f6c5..5e47150 100755
--- a/linux/docker_image/build_stages/essentials.sh
+++ b/linux/docker_image/build_stages/essentials.sh
@@ -3,4 +3,4 @@ set -e
 source /pbba_build/shared/lib/library.sh
 
 header "Installing essentials"
-run_yum_install pth-devel ncurses-devel xz
+run_yum_install npth ncurses-devel xz
diff --git a/linux/docker_image/build_stages/install_s3cmd.sh b/linux/docker_image/build_stages/install_s3cmd.sh
index e40e6f4..7477b2c 100755
--- a/linux/docker_image/build_stages/install_s3cmd.sh
+++ b/linux/docker_image/build_stages/install_s3cmd.sh
@@ -13,4 +13,4 @@ run mkdir -p /hbb/s3cmd
 run cp -pR * /hbb/s3cmd/
 run cp /pbba_build/linux/docker_image/support/s3cmd_wrapper.sh /hbb/bin/s3cmd
 
-run pip install --cert /etc/ssl/certs/ca-bundle.crt python-dateutil
+run pip2 install --cert /etc/ssl/certs/ca-bundle.crt python-dateutil
diff --git a/linux/docker_image/support/s3cmd_wrapper.sh b/linux/docker_image/support/s3cmd_wrapper.sh
index f1eb67d..04e7a8c 100755
--- a/linux/docker_image/support/s3cmd_wrapper.sh
+++ b/linux/docker_image/support/s3cmd_wrapper.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 set -e
-exec /usr/bin/env python /hbb/s3cmd/s3cmd "$@"
+exec /usr/bin/env python2 /hbb/s3cmd/s3cmd "$@"