nik/easyrsa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ff_date_to_cert_date(): Correct the input format for busybox date

Browse Source 
Also, correct alignment and indents with no functional change.

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2022-12-07 23:15:04 +00:00
parent 9266caaf33
commit 3c0d90799f
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
easyrsa3/easyrsa
View File

@ -3652,25 +3652,27 @@ ff_date_to_cert_date() {
if busybox date --help > /dev/null 2>&1
then
cert_type_date="$(
busybox date -u -D "%b %e %H:%M:%S %Y" -d "$in_date" \
"+%b %d %H:%M:%S %Y %Z" 2>/dev/null
)"
busybox date -u -D "%y-%m-%d %H:%M:%S%Z" \
-d "$in_date" \
"+%b %d %H:%M:%S %Y %Z" 2>/dev/null
)"
return
# Darwin, BSD
elif cert_type_date="$(
date -u -j -f '%y-%m-%d %TZ' "$in_date" "+%b %d %H:%M:%S %Y %Z" \
2>/dev/null
)"
date -u -j -f '%y-%m-%d %TZ' "$in_date" \
"+%b %d %H:%M:%S %Y %Z" 2>/dev/null
)"
then return
# OS dependencies
# Linux and Windows (FTR: date.exe does not support format +%s as input)
# Linux and Windows
# * date.exe does not support format +%s as input
# MacPorts GNU date
elif cert_type_date="$(
date -u -d "$in_date" "+%b %d %H:%M:%S %Y %Z" \
2>/dev/null
)"
date -u -d "$in_date" \
"+%b %d %H:%M:%S %Y %Z" 2>/dev/null
)"
then return
# Something else