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

dehydrated#910 hexdump not always available #943

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dehydrated
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ _mktemp() {
# Check for script dependencies
check_dependencies() {
# look for required binaries
for binary in grep mktemp diff sed awk curl cut head tail hexdump; do
for binary in grep mktemp diff sed awk curl cut head tail od; do
bin_path="$(command -v "${binary}" 2>/dev/null)" || _exiterr "This script requires ${binary}."
[[ -x "${bin_path}" ]] || _exiterr "${binary} found in PATH but it's not executable"
done
Expand Down Expand Up @@ -839,7 +839,7 @@ hex2bin() {

# Convert binary data to hex string
bin2hex() {
hexdump -v -e '/1 "%02x"'
od -t xC -An | tr -d '[:space:]'
}

# OpenSSL writes to stderr/stdout even when there are no errors. So just
Expand Down