fixup

# Conflicts:
#	codeserver/ubi9-python-3.11/nginx/root/usr/share/container-scripts/nginx/common.sh
#	tests/test_main.py

Author: jiridanek

codeserver/ubi9-python-3.12/nginx/root/usr/share/container-scripts/nginx/common.sh

@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # get_matched_files finds file for image extending
-get_matched_files() {
+function get_matched_files() {
+  local custom_dir default_dir
   custom_dir="$1"
   default_dir="$2"
   files_matched="$3"
@@ -12,17 +13,19 @@ get_matched_files() {
 # process_extending_files process extending files in $1 and $2 directories
 # - source all *.sh files
 #   (if there are files with same name source only file from $1)
-process_extending_files() {
+function process_extending_files() {
+  local custom_dir default_dir
   custom_dir=$1
   default_dir=$2
- get_matched_files "$custom_dir" "$default_dir" '*.sh' | sort -u | while read -r filename; do
-  if [ "$filename" ]; then
-    echo "=> sourcing $filename ..."
-    if [ -f "$custom_dir/$filename" ]; then
-      . "$custom_dir/$filename"
-    elif [ -f "$default_dir/$filename" ]; then 
-      . "$default_dir/$filename"
+  while read -r filename ; do
+    if [ "$filename" ]; then
+      echo "=> sourcing $filename ..."
+      # custom file has precedence
+      if [ -f "$custom_dir/$filename" ]; then
+        source "$custom_dir/$filename"
+      elif [ -f "$default_dir/$filename" ]; then
+        source "$default_dir/$filename"
+      fi
     fi
-  fi
-done
-}
+  done <<<"$(get_matched_files "$custom_dir" "$default_dir" '*.sh' | sort -u)"
+}

rstudio/c9s-python-3.11/nginx/root/usr/share/container-scripts/nginx/common.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # get_matched_files finds file for image extending
 function get_matched_files() {
@@ -17,15 +17,15 @@ function process_extending_files() {
   local custom_dir default_dir
   custom_dir=$1
   default_dir=$2
-  while read filename ; do
-    if [ $filename ]; then
+  while read -r filename ; do
+    if [ "$filename" ]; then
       echo "=> sourcing $filename ..."
-      # Custom file is prefered
-      if [ -f $custom_dir/$filename ]; then
-        source $custom_dir/$filename
-      elif [ -f $default_dir/$filename ]; then 
-        source $default_dir/$filename
+      # custom file has precedence
+      if [ -f "$custom_dir/$filename" ]; then
+        source "$custom_dir/$filename"
+      elif [ -f "$default_dir/$filename" ]; then
+        source "$default_dir/$filename"
       fi
     fi
   done <<<"$(get_matched_files "$custom_dir" "$default_dir" '*.sh' | sort -u)"
-}
+}

rstudio/rhel9-python-3.11/nginx/root/usr/share/container-scripts/nginx/common.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # get_matched_files finds file for image extending
 function get_matched_files() {
@@ -17,15 +17,15 @@ function process_extending_files() {
   local custom_dir default_dir
   custom_dir=$1
   default_dir=$2
-  while read filename ; do
-    if [ $filename ]; then
+  while read -r filename ; do
+    if [ "$filename" ]; then
       echo "=> sourcing $filename ..."
-      # Custom file is prefered
-      if [ -f $custom_dir/$filename ]; then
-        source $custom_dir/$filename
-      elif [ -f $default_dir/$filename ]; then 
-        source $default_dir/$filename
+      # custom file has precedence
+      if [ -f "$custom_dir/$filename" ]; then
+        source "$custom_dir/$filename"
+      elif [ -f "$default_dir/$filename" ]; then
+        source "$default_dir/$filename"
       fi
     fi
   done <<<"$(get_matched_files "$custom_dir" "$default_dir" '*.sh' | sort -u)"
-}
+}

tests/test_main.py

@@ -322,11 +322,17 @@ def test_files_that_should_be_same_are_same(subtests: pytest_subtests.plugin.Sub
         "ROCm de-vendor script": [
             PROJECT_ROOT / "jupyter/rocm/pytorch/ubi9-python-3.12/de-vendor-torch.sh",
             PROJECT_ROOT / "runtimes/rocm-pytorch/ubi9-python-3.12/de-vendor-torch.sh",
+        ],
+        "nginx/common.sh": [
+           PROJECT_ROOT / "codeserver/ubi9-python-3.12/nginx/root/usr/share/container-scripts/nginx/common.sh",
+           PROJECT_ROOT / "rstudio/c9s-python-3.11/nginx/root/usr/share/container-scripts/nginx/common.sh",
+           PROJECT_ROOT / "rstudio/rhel9-python-3.11/nginx/root/usr/share/container-scripts/nginx/common.sh",
         ]
     }
     for group_name, (first_file, *rest) in file_groups.items():
         with subtests.test(msg=f"Checking {group_name}"):
             for file in rest:
+                # file.write_text(first_file.read_text())
                 assert first_file.read_text() == file.read_text(), f"The files {first_file} and {file} do not match"