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

Hotfix v3.7.1. #219

Merged
merged 6 commits into from May 24, 2022
Merged

Hotfix v3.7.1. #219

merged 6 commits into from May 24, 2022

Conversation

yubiuser
Copy link
Member

@yubiuser yubiuser commented May 23, 2022 •
edited

Fixes #218 by referencing /usr/bin/env sh instead of /usr/bin/sh within the shebang.

@yubiuser
Use /bin/sh instead of /usr/bin/sh
efafb2c 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Version bump 3.7.1
6bb4b48 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser yubiuser requested a review from a team May 23, 2022 20:00
@dschaper
Copy link
Member

Do you want to use that path or do you want to pull from env?

@yubiuser
Call sh via /bin/env sh
4f2e248 
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Copy link
Member Author

If we go for /bin/env sh, PR #220 must be merged first.

@Gothico74
Copy link

This fix (editing line 1) gives me at least a (working pih) screen output

@yubiuser
Copy link
Member Author

Yeah. We haven't decided yet if we go with /bin/sh or /bin/env sh. Both should work. As a workaround you can change the first line to one of those. I'll hope to get v3.7.1 shipped today.

@Cantrepeat
Copy link

editing the first line to /bin/sh does indeed fix the issue.

dschaper
dschaper reviewed May 24, 2022
View reviewed changes
padd.sh Outdated Show resolved Hide resolved
@dschaper dschaper mentioned this pull request May 24, 2022
Merged
yubiuser and others added 2 commits May 24, 2022 20:05
@yubiuser @dschaper
Use correct env path
844918d 
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
@yubiuser
Merge pull request #220 from pi-hole/env
abbd949 
Call sh via /bin/env sh
@yubiuser yubiuser requested a review from dschaper May 24, 2022 18:08
@yubiuser
Copy link
Member Author

Needs squash merge.

@dschaper dschaper merged commit a134724 into master May 24, 2022
@christianboyle
Copy link
Contributor

@yubiuser Thanks for the quick fix!

dschaper added a commit that referenced this pull request May 25, 2022
@yubiuser @dschaper
Hotfix v3.7.1. (#219) (#221)
75907e3 
* Use /bin/sh instead of /usr/bin/sh

* Version bump 3.7.1

Signed-off-by: Christian König <ckoenig@posteo.de>

Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dschaper dschaper dschaper 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.

Updating to v3.7.0 results in error
5 participants
@yubiuser @dschaper @Gothico74 @Cantrepeat @christianboyle