Remove chakracore config leftovers where subdir had versions

This commit is contained in:
Tommi Vainikainen 2020-07-06 21:24:56 +03:00
parent 4f8e425a92
commit 553b5e3b59
1 changed files with 6 additions and 22 deletions

View File

@ -46,10 +46,10 @@ function get_arch() {
} }
# Get corresponding variants based on the architecture. # Get corresponding variants based on the architecture.
# All supported variants of each supported architecutre are listed in a # All supported variants of each supported architecture are listed in a
# file - 'architectures'. Its format is: # file - 'architectures'. Its format is:
# <architecutre 1> <supported variant 1 >,<supported variant 2>... # <architecture 1> <supported variant 1 >,<supported variant 2>...
# <architecutre 2> <supported variant 1 >,<supported variant 2>... # <architecture 2> <supported variant 1 >,<supported variant 2>...
function get_variants() { function get_variants() {
local dir local dir
dir=${1:-.} dir=${1:-.}
@ -133,33 +133,17 @@ function get_config() {
# Get available versions for a given path # Get available versions for a given path
# #
# If full or partial versions are provided then they are processed and
# validated. e.g. "6 chakracore" returns "6 chakracore/8" since it processed the
# chakracore entry and found it to be a fork rather than a complete version.
#
# The result is a list of valid versions. # The result is a list of valid versions.
function get_versions() { function get_versions() {
local prefix
prefix=${1:-.}
shift
local versions=() local versions=()
local dirs=("$@") local dirs=()
local default_variant local default_variant
default_variant=$(get_config "./" "default_variant") default_variant=$(get_config "./" "default_variant")
if [ ${#dirs[@]} -eq 0 ]; then IFS=' ' read -ra dirs <<< "$(echo "./"*/)"
IFS=' ' read -ra dirs <<< "$(echo "${prefix%/}/"*/)"
fi
for dir in "${dirs[@]}"; do for dir in "${dirs[@]}"; do
if [ -a "${dir}/config" ]; then if [ -a "${dir}/Dockerfile" ] || [ -a "${dir}/${default_variant}/Dockerfile" ]; then
local subdirs
IFS=' ' read -ra subdirs <<< "$(get_versions "${dir#./}")"
for subdir in "${subdirs[@]}"; do
versions+=("${subdir}")
done
elif [ -a "${dir}/Dockerfile" ] || [ -a "${dir}/${default_variant}/Dockerfile" ]; then
versions+=("${dir#./}") versions+=("${dir#./}")
fi fi
done done