Skip to content

fix(scripts): resolve exclude_inherited_files bugs in profile file ha… #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 28, 2025
Merged

fix(scripts): resolve exclude_inherited_files bugs in profile file ha… #248

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 27 additions & 9 deletions scripts/common-functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,14 +307,31 @@ get_profile_file() {
local profile_dir="$base_dir/profiles/$current_profile"
local full_path="$profile_dir/$file_path"

# Check for profile config first (needed for exclusion check)
local profile_config="$profile_dir/profile-config.yml"

# Check if file exists in current profile
if [[ -f "$full_path" ]]; then
# Check if this file is excluded (even in current profile)
if [[ -f "$profile_config" ]]; then
local excluded="false"
while read pattern; do
if [[ -n "$pattern" ]] && match_pattern "$file_path" "$pattern"; then
excluded="true"
break
fi
done < <(get_yaml_array "$profile_config" "exclude_inherited_files")

if [[ "$excluded" == "true" ]]; then
echo ""
return
fi
fi
echo "$full_path"
return
fi

# Check for inheritance
local profile_config="$profile_dir/profile-config.yml"
if [[ ! -f "$profile_config" ]]; then
# No profile config means this is likely the default profile
echo ""
Expand All @@ -328,15 +345,16 @@ get_profile_file() {
return
fi

# Check if file is excluded
local excluded=$(get_yaml_array "$profile_config" "exclude_inherited_files" | while read pattern; do
if match_pattern "$file_path" "$pattern"; then
echo "yes"
# Check if file is excluded during inheritance
local excluded="false"
while read pattern; do
if [[ -n "$pattern" ]] && match_pattern "$file_path" "$pattern"; then
excluded="true"
break
fi
done)
done < <(get_yaml_array "$profile_config" "exclude_inherited_files")

if [[ "$excluded" == "yes" ]]; then
if [[ "$excluded" == "true" ]]; then
echo ""
return
fi
Expand Down Expand Up @@ -424,12 +442,12 @@ get_profile_files() {

# Check if excluded
excluded="false"
echo "$excluded_patterns" | while read pattern; do
while read pattern; do
if [[ -n "$pattern" ]] && match_pattern "$relative_path" "$pattern"; then
excluded="true"
break
fi
done
done <<< "$excluded_patterns"

if [[ "$excluded" != "true" ]]; then
# Check if already in list (override scenario)
Expand Down