Skip to content

Bug fix: not found error if hook folder contains files but non ending with *.sh#2095

Merged
J0WI merged 4 commits intonextcloud:masterfrom
dvaerum:master
Nov 14, 2023
Merged

Bug fix: not found error if hook folder contains files but non ending with *.sh#2095
J0WI merged 4 commits intonextcloud:masterfrom
dvaerum:master

Conversation

@dvaerum
Copy link
Contributor

@dvaerum dvaerum commented Nov 5, 2023

This is an attempt to fix the bug which was introduced by me in
#1964
and reported in
#2094

If there is a good way to make unittest for this, I am all ears.

dvaerum and others added 2 commits November 5, 2023 23:25
Signed-off-by: Dennis Vestergaard Værum <github@varum.dk>
Signed-off-by: Dennis Vestergaard Værum <github@varum.dk>
dvaerum and others added 2 commits November 10, 2023 21:42
Co-authored-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: Dennis Værum <6872940+dvaerum@users.noreply.github.com>
Small adjustments

Signed-off-by: Dennis Værum <6872940+dvaerum@users.noreply.github.com>
@dvaerum
Copy link
Contributor Author

dvaerum commented Nov 11, 2023

@J0WI should I change -maxdepth 1 to something like -maxdepth "${CUSTOM_HOOKS_FIND_MAX_DEPTH:-1}" to address what @d0niek talked about in #2094 or is that something for another pull request?

Anyway, hope it all looks good to you 😄

@J0WI J0WI merged commit 23d099b into nextcloud:master Nov 14, 2023
@dvaerum
Copy link
Contributor Author

dvaerum commented Nov 15, 2023

@J0WI, thanks for merging and a pleasure to work with you again 😁

@joshtrichards
Copy link
Member

Thanks, @dvaerum, for addressing so quickly!

J0WI pushed a commit that referenced this pull request Jan 9, 2024
* Fix docker-entrypoint.sh

Signed-off-by: Yevhen Kolomeiko <Jarvis2709@gmail.com>

* Fix docker-entrypoint.sh for alpine

Signed-off-by: Yevhen Kolomeiko <Jarvis2709@gmail.com>

* Use '-o' instead of two find's in docker-entrypoint.sh

Signed-off-by: Yevhen Kolomeiko <Jarvis2709@gmail.com>

* Use more laconic find parameters set in docker-entrypoint.sh

Signed-off-by: Yevhen Kolomeiko <Jarvis2709@gmail.com>

---------

Signed-off-by: Yevhen Kolomeiko <Jarvis2709@gmail.com>
ananace pushed a commit to ananace/docker-nextcloud that referenced this pull request May 10, 2024
… with `*.sh` (nextcloud#2095)

* Use `find` to located `*.sh`

Signed-off-by: Dennis Vestergaard Værum <github@varum.dk>

* added msg if hook folder does not exist

Signed-off-by: Dennis Vestergaard Værum <github@varum.dk>

* Updated info message

Co-authored-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: Dennis Værum <6872940+dvaerum@users.noreply.github.com>

* Update docker-entrypoint.sh

Small adjustments

Signed-off-by: Dennis Værum <6872940+dvaerum@users.noreply.github.com>

---------

Signed-off-by: Dennis Vestergaard Værum <github@varum.dk>
Signed-off-by: Dennis Værum <6872940+dvaerum@users.noreply.github.com>
Co-authored-by: J0WI <J0WI@users.noreply.github.com>
@joshtrichards joshtrichards linked an issue Nov 25, 2024 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Run custom hooks in entrypoint for non empty directories

3 participants