diff --git a/codeserver/ubi9-python-3.12/nginx/root/usr/share/container-scripts/nginx/common.sh b/codeserver/ubi9-python-3.12/nginx/root/usr/share/container-scripts/nginx/common.sh index 319219cd2c..b9d3e7f8d5 100755 --- a/codeserver/ubi9-python-3.12/nginx/root/usr/share/container-scripts/nginx/common.sh +++ b/codeserver/ubi9-python-3.12/nginx/root/usr/share/container-scripts/nginx/common.sh @@ -1,8 +1,7 @@ #!/bin/sh # get_matched_files finds file for image extending -function get_matched_files() { - local custom_dir default_dir +get_matched_files() { custom_dir="$1" default_dir="$2" files_matched="$3" @@ -13,19 +12,17 @@ function 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) -function process_extending_files() { - local custom_dir default_dir +process_extending_files() { custom_dir=$1 default_dir=$2 - while read 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 - fi + 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" fi - done <<<"$(get_matched_files "$custom_dir" "$default_dir" '*.sh' | sort -u)" + fi +done } \ No newline at end of file