From 27de3a9607ecc8f4e5cf6c6553951d560928a018 Mon Sep 17 00:00:00 2001
From: Bjoern Teipel <bjoern.teipel@rackspace.com>
Date: Fri, 18 Oct 2024 10:42:18 -0500
Subject: [PATCH] Fix proxy url setting and adding community.general collection

---
 scripts/prepare.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/prepare.sh b/scripts/prepare.sh
index 67c8b44d..77e55cc2 100755
--- a/scripts/prepare.sh
+++ b/scripts/prepare.sh
@@ -18,8 +18,8 @@ fi
 
 if [ $hasProxy == true ]; then
   if [ $isRH == false ]; then
-    export HTTP_PROXY=`awk '/Acquire::http::Proxy/ {str=$2; gsub(";","",str); print str}' /etc/apt/apt.conf`
-    export HTTPS_PROXY=`awk '/Acquire::https::Proxy/ {str=$2; gsub(";","",str); print str}' /etc/apt/apt.conf`
+    export HTTP_PROXY=`awk '/Acquire::http::Proxy/ {str=$2; gsub("[;\"]","",str); print str}' /etc/apt/apt.conf`
+    export HTTPS_PROXY=`awk '/Acquire::https::Proxy/ {str=$2; gsub("[;\"]","",str); print str}' /etc/apt/apt.conf`
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
   fi
@@ -38,6 +38,7 @@ pip install -r /opt/rpc-maas/requirements.txt
 
 ansible-galaxy collection install community.rabbitmq
 ansible-galaxy collection install openstack.cloud
+ansible-galaxy collection install community.general
 
 deactivate