From bd04df99be2191e3998df09f0b2a0d9b836f6d41 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Thu, 12 Jan 2023 18:02:32 +0100
Subject: [PATCH] [bitnami/cassandra] Release 4.1.0-debian-11-r7 (#20032)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/cassandra/4.1/debian-11/Dockerfile                    | 3 ++-
 .../debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh    | 2 +-
 .../4.1/debian-11/rootfs/opt/bitnami/scripts/cassandra/run.sh | 4 ++--
 .../4.1/debian-11/rootfs/opt/bitnami/scripts/libcassandra.sh  | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bitnami/cassandra/4.1/debian-11/Dockerfile b/bitnami/cassandra/4.1/debian-11/Dockerfile
index b3f956019fac..b6297337a1f0 100644
--- a/bitnami/cassandra/4.1/debian-11/Dockerfile
+++ b/bitnami/cassandra/4.1/debian-11/Dockerfile
@@ -5,7 +5,8 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="4.1.0-debian-11-r6" \
+      org.opencontainers.image.licenses="Apache-2.0" \
+      org.opencontainers.image.ref.name="4.1.0-debian-11-r7" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/cassandra" \
       org.opencontainers.image.title="cassandra" \
       org.opencontainers.image.vendor="VMware, Inc." \
diff --git a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
index f3bc7568bfa5..ad2f0eee48df 100644
--- a/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
+++ b/bitnami/cassandra/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
@@ -31,7 +31,7 @@ get_sematic_version () {
 
         while [[ $i -lt $n ]]; do
             if [[ -n "${BASH_REMATCH[$i]}" ]] && [[ "${BASH_REMATCH[$i]:0:1}" != '.' ]];  then
-                version_sections[$j]=${BASH_REMATCH[$i]}
+                version_sections[j]="${BASH_REMATCH[$i]}"
                 ((j++))
             fi
             ((i++))
diff --git a/bitnami/cassandra/4.1/debian-11/rootfs/opt/bitnami/scripts/cassandra/run.sh b/bitnami/cassandra/4.1/debian-11/rootfs/opt/bitnami/scripts/cassandra/run.sh
index a74fedeebad8..37a1c76407d9 100755
--- a/bitnami/cassandra/4.1/debian-11/rootfs/opt/bitnami/scripts/cassandra/run.sh
+++ b/bitnami/cassandra/4.1/debian-11/rootfs/opt/bitnami/scripts/cassandra/run.sh
@@ -34,7 +34,7 @@ info "** Starting Cassandra **"
 #
 # If none of the two cases apply, we assume it is an error and exit
 if is_cassandra_running; then
-    readonly __run_pid="$(get_pid_from_file "$CASSANDRA_PID_FILE")"
+    __run_pid="$(get_pid_from_file "$CASSANDRA_PID_FILE")"
     running_log_file=""
 
     if [[ -f "$CASSANDRA_FIRST_BOOT_LOG_FILE" ]]; then
@@ -49,7 +49,7 @@ if is_cassandra_running; then
     fi
 
     info "Tailing $running_log_file"
-    readonly __run_tail_cmd="$(which tail)"
+    __run_tail_cmd="$(which tail)"
     readonly __run_tail_flags=("--pid=${__run_pid}" "-n" "1000" "-f" "$running_log_file")
 
     if am_i_root; then
diff --git a/bitnami/cassandra/4.1/debian-11/rootfs/opt/bitnami/scripts/libcassandra.sh b/bitnami/cassandra/4.1/debian-11/rootfs/opt/bitnami/scripts/libcassandra.sh
index 7091b5e5a2d0..adf3b44a0082 100644
--- a/bitnami/cassandra/4.1/debian-11/rootfs/opt/bitnami/scripts/libcassandra.sh
+++ b/bitnami/cassandra/4.1/debian-11/rootfs/opt/bitnami/scripts/libcassandra.sh
@@ -289,7 +289,7 @@ cassandra_copy_default_config() {
     local -r tmp_file_list=/tmp/conf_file_list
     find "$CASSANDRA_DEFAULT_CONF_DIR" -type f >$tmp_file_list
     while read -r f; do
-        filename="${f#${CASSANDRA_DEFAULT_CONF_DIR}/}" # Get path with subfolder
+        filename="${f#"${CASSANDRA_DEFAULT_CONF_DIR}/"}" # Get path with subfolder
         dest="${f//$CASSANDRA_DEFAULT_CONF_DIR/$CASSANDRA_CONF_DIR}"
         if [[ -f "$dest" ]]; then
             debug "Found ${filename}. Skipping default"