From fd0abcf75ad7fb59f43c7f6309293b3912304510 Mon Sep 17 00:00:00 2001
From: Karl Rister <krister@redhat.com>
Date: Tue, 13 Aug 2024 14:06:40 -0500
Subject: [PATCH] remove custom built engine bash

---
 engine/bootstrap             |  2 +-
 engine/engine-script         |  2 +-
 engine/engine-script-library |  2 +-
 rickshaw-run                 | 46 +-----------------------------------
 4 files changed, 4 insertions(+), 48 deletions(-)

diff --git a/engine/bootstrap b/engine/bootstrap
index a48c5b92..ceb264da 100755
--- a/engine/bootstrap
+++ b/engine/bootstrap
@@ -1,4 +1,4 @@
-#!/usr/local/bin/bash
+#!/usr/bin/bash
 # -*- mode: sh; indent-tabs-mode: nil; sh-basic-offset: 4 -*-
 # vim: autoindent tabstop=4 shiftwidth=4 expandtab softtabstop=4 filetype=bash
 #
diff --git a/engine/engine-script b/engine/engine-script
index 66177fb7..ce7240c2 100755
--- a/engine/engine-script
+++ b/engine/engine-script
@@ -1,4 +1,4 @@
-#!/usr/local/bin/bash
+#!/usr/bin/bash
 # -*- mode: sh; indent-tabs-mode: nil; sh-basic-offset: 4 -*-
 # vim: autoindent tabstop=4 shiftwidth=4 expandtab softtabstop=4 filetype=bash
 exec 2>&1
diff --git a/engine/engine-script-library b/engine/engine-script-library
index 1feb0f16..d576d091 100644
--- a/engine/engine-script-library
+++ b/engine/engine-script-library
@@ -1,4 +1,4 @@
-#!/usr/local/bin/bash
+#!/usr/bin/bash
 # -*- mode: sh; indent-tabs-mode: nil; sh-basic-offset: 4 -*-
 # vim: autoindent tabstop=4 shiftwidth=4 expandtab softtabstop=4 filetype=bash
 
diff --git a/rickshaw-run b/rickshaw-run
index 1caf4605..1ac27b2b 100755
--- a/rickshaw-run
+++ b/rickshaw-run
@@ -753,51 +753,7 @@ sub build_reqs {
     # that does not exist, we want to match an imagewith as many requirements
     # as possible and add only what we need.
 
-    # The most common requirement is expected to be source built bash
-    # -- this provides a common bash feature set across all userenvs
-    my $bash_req_file = $config_dir . "/bash-req.json";
-    my %bash_req = (
-                    'workshop' => {
-                        'schema' => {
-                            'version' => '2020.03.02'
-                        }
-                    },
-                    'userenvs' => [
-                        {
-                            'name' => 'default',
-                            'requirements' => [
-                                'bash_src'
-                            ]
-                        }
-                    ],
-                    'requirements' => [
-                        {
-                            'name' => 'bash_src',
-                            'type' => 'source',
-                            'source_info' => {
-                                'url' => 'https://mirrors.ibiblio.org/gnu/bash/bash-5.2.21.tar.gz',
-                                'filename' => 'bash.tar.gz',
-                                'commands' => {
-                                    'unpack' => 'tar -xzf bash.tar.gz',
-                                    'get_dir' => 'tar -tzf bash.tar.gz | head -n 1',
-                                    'commands' => [
-                                        './configure --prefix=/usr/local',
-                                        'make',
-                                        'make install',
-                                        '/usr/local/bin/bash --version'
-                                    ]
-                                }
-                            }
-                        }
-                    ]
-                );
-    if (put_json_file($bash_req_file, \%bash_req) > 0) {
-        printf "build_container_image(): put_json_file() failed\n";
-        exit 1;
-    }
-    push (@$req_ref, "--requirement " . $bash_req_file);
-
-    # The next most common requirment is expected to be the toolbox.
+    # The most common requirment is expected to be the toolbox.
     my $tb_req_file = $config_dir . "/toolbox-req.json";
     my %tb_req = (
                     'workshop' => {