Fix error when uploading files from ios gallery to a share with recycle #116
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- add variable to define default vfs objects - add new fruit: options - add catia object - change condition to only include recycle when set to yes When "vfs objects" is called inside a share block it overrides what's in global instead of merging them. https://www.samba.org/samba/docs/current/man-html/smb.conf.5.html#VFSOBJECTS https://wiki.samba.org/index.php/Configure_Samba_to_Work_Better_with_Mac_OS_X
crazy-max
reviewed
Nov 2, 2024
| @@ -185,8 +194,8 @@ if [[ "$(yq --output-format=json e '(.. | select(tag == "!!str")) |= envsubst' " | |||
| if [[ "$(_jq '.hidefiles')" != "null" ]] && [[ -n "$(_jq '.hidefiles')" ]]; then | |||
| echo "hide files = $(_jq '.hidefiles')" >> /etc/samba/smb.conf | |||
| fi | |||
| if [[ "$(_jq '.recycle')" != "null" ]] && [[ -n "$(_jq '.recycle')" ]]; then | |||
| echo "vfs objects = recycle" >> /etc/samba/smb.conf | |||
| if [[ -n "$(_jq '.recycle')" ]] && [[ "$(_jq '.recycle')" == "yes" ]]; then | |||
There was a problem hiding this comment.
I think you need to check nullable first:
Suggested change
| if [[ -n "$(_jq '.recycle')" ]] && [[ "$(_jq '.recycle')" == "yes" ]]; then | |
| if [[ "$(_jq '.recycle')" != "null" ]] && [[ "$(_jq '.recycle')" = "yes" ]]; then |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When "vfs objects" is called inside a share block it overrides what's in global instead of merging them.
https://www.samba.org/samba/docs/current/man-html/smb.conf.5.html#VFSOBJECTS https://wiki.samba.org/index.php/Configure_Samba_to_Work_Better_with_Mac_OS_X