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.

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

fix: relative paths to dirs #576

Merged
merged 1 commit into from
Nov 14, 2022
Merged

fix: relative paths to dirs #576

merged 1 commit into from
Nov 14, 2022

Conversation

caarlos0
Copy link
Member

@caarlos0 caarlos0 commented Nov 13, 2022

closes #575

@caarlos0 caarlos0 self-assigned this Nov 13, 2022
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 13, 2022
@vercel vercel bot temporarily deployed to Preview November 13, 2022 01:07 Inactive
@caarlos0 caarlos0 added the bug Something isn't working label Nov 13, 2022
@caarlos0 caarlos0 marked this pull request as ready for review November 13, 2022 01:07
Signed-off-by: Carlos A Becker <caarlos0@users.noreply.github.com>
@vercel vercel bot temporarily deployed to Preview November 13, 2022 01:08 Inactive
@codecov
Copy link

codecov bot commented Nov 13, 2022

Codecov Report

Merging #576 (119958f) into main (5c3cc38) will increase coverage by 0.02%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main     #576      +/-   ##
==========================================
+ Coverage   70.22%   70.25%   +0.02%     
==========================================
  Files          21       21              
  Lines        3130     3133       +3     
==========================================
+ Hits         2198     2201       +3     
  Misses        715      715              
  Partials      217      217              
Impacted Files Coverage Δ
internal/glob/glob.go 84.37% <100.00%> (+0.76%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Copy link
Contributor

@djgilcrease djgilcrease left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@caarlos0 caarlos0 merged commit b15966c into main Nov 14, 2022
@caarlos0 caarlos0 deleted the fix-relpath branch November 14, 2022 12:39
@github-actions github-actions bot added this to the v2.23.0 milestone Nov 14, 2022
@drakkan
Copy link

drakkan commented Nov 20, 2022

Hi,

this change broke my use case.

Please take a look here.
I now have this error:

cannot add "/home/nicola/goprojects/sftpgo/templates/webclient/twofactor.html" because "/home/nicola/goprojects/sftpgo/templates/webadmin/twofactor.html" is already present at the same destination (/usr/share/sftpgo/templates/twofactor.html): content collision

I have some files with the same name in templates/webclient and templates/webadmin. Can I fix this by changing my glob syntax? (I've tried some alternate globs with no luck). Thanks

EDIT: If I change

- src: "${BASE_DIR}/templates/*"
  dst: "/usr/share/sftpgo/templates/"

to

- src: "${BASE_DIR}/templates/*"
   dst: "/usr/share/sftpgo/templates"

it works as before. No problem if this is the intended behaviour

@caarlos0
Copy link
Member Author

caarlos0 commented Nov 20, 2022

@drakkan yes, unfortunately this might be a breaking change for some... but I still think it was a bug before... I'll add a note about it in the release notes though.

@caarlos0
Copy link
Member Author

@drakkan
Copy link

drakkan commented Nov 20, 2022

@drakkan yes, unfortunately this might be a breaking change for some... but I still think it was a bug before... I'll add a note about it in the release notes though.

no problem, thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Confusing behaviour with trailing / in destination
3 participants