Skip to content
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

Jump to bottom

fix(default-flatpaks): Last module definition overwrites the 1st one #263

Merged
merged 1 commit into from
Jun 19, 2024
Merged

fix(default-flatpaks): Last module definition overwrites the 1st one #263

merged 1 commit into from
Jun 19, 2024

Conversation

fiftydinar
Copy link
Collaborator

No description provided.

@fiftydinar fiftydinar requested a review from xynydev as a code owner June 19, 2024 14:24
@fiftydinar fiftydinar mentioned this pull request Jun 19, 2024
Closed
@fiftydinar fiftydinar linked an issue Jun 19, 2024 that may be closed by this pull request
fix(default-flatpaks): Flatpak IDs input in the last module definition overwrites the 1st one #231
Closed
@xynydev xynydev merged commit e668d2e into blue-build:main Jun 19, 2024
@fiftydinar fiftydinar deleted the df-fix branch June 19, 2024 14:31
@lorduskordus
Copy link
Contributor

Shouldn't it be two separate if conditions ? Both the files have to be there and the second branch (elif) gets evaluated only when the first branch (if) is not true

Like this:

    if [ ! -f "/usr/share/bluebuild/default-flatpaks/system/install" ]; then
      cp -r "$MODULE_DIRECTORY"/default-flatpaks/config/system/install /usr/share/bluebuild/default-flatpaks/system/install
    fi
    if [ ! -f "/usr/share/bluebuild/default-flatpaks/system/remove" ]; then  
      cp -r "$MODULE_DIRECTORY"/default-flatpaks/config/system/remove /usr/share/bluebuild/default-flatpaks/system/remove
    fi

@fiftydinar
Copy link
Collaborator Author

Shouldn't it be two separate if conditions ? Both the files have to be there and the second branch (elif) gets evaluated only when the first branch (if) is not true

Like this:

    if [ ! -f "/usr/share/bluebuild/default-flatpaks/system/install" ]; then
      cp -r "$MODULE_DIRECTORY"/default-flatpaks/config/system/install /usr/share/bluebuild/default-flatpaks/system/install
    fi
    if [ ! -f "/usr/share/bluebuild/default-flatpaks/system/remove" ]; then  
      cp -r "$MODULE_DIRECTORY"/default-flatpaks/config/system/remove /usr/share/bluebuild/default-flatpaks/system/remove
    fi

I apologize, you're right, I fixed it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xynydev xynydev xynydev approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

fix(default-flatpaks): Flatpak IDs input in the last module definition overwrites the 1st one
3 participants
@fiftydinar @lorduskordus @xynydev