Fix dependency issue with install and other misc. fixes #84
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
…mmands and fix misc. globbing issues
pickfire
reviewed
Apr 14, 2018
| @@ -8,7 +8,7 @@ if [ "$(whoami)" != "root" ]; then | |||
| fi | |||
|
|
|||
| for dep in getent grep useradd groupadd gpasswd cut ps chmod chown; do | |||
| if $(which $dep) &>/dev/null; then | |||
| if which $dep &>/dev/null; then | |||
There was a problem hiding this comment.
I think it's better to use command -v to check for dependency.
pickfire
reviewed
Apr 14, 2018
| @@ -19,7 +19,7 @@ done | |||
| DESTDIR="/usr/bin/" | |||
| echo "Destination directory for hostsblock is $DESTDIR. Enter a new path or press Enter to keep as is." | |||
| read -p "$DESTDIR " d | |||
| if [ "$d" != "" ] || [ -n $d ]; then | |||
| if [ "$d" != "" ] || [[ -n $d ]]; then | |||
There was a problem hiding this comment.
What about using [ -n "$d" ] instead, [[ ]] in too bashism.
pickfire
reviewed
Apr 14, 2018
| @@ -46,8 +46,8 @@ fi | |||
| gpasswd -a hostsblock hostsblock | |||
| gpasswd -A hostsblock hostsblock | |||
|
|
|||
| if ps aux | grep [d]nsmasq | tr -s ' ' | cut -d' ' -f 11- | grep -q [d]nsmasq; then | |||
| dnsmasq_user=$(ps aux | grep [d]nsmasq | tr -s ' ' | cut -d' ' -f 1) | |||
| if ps aux | grep '[d]nsmasq' | tr -s ' ' | cut -d' ' -f 11- | grep -q '[d]nsmasq'; then | |||
There was a problem hiding this comment.
Maybe we can use ps -o user= -p $(sudo dnsmasq)?
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.
Fixes the install script checking for dependencies and certain expressions always returning true.
Added safeguards around expressions in the hostsblock script to prevent them from executing for some reason.