Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-06 07:30:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use temp variable for curl -V output

Browse source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2025-01-29 19:19:01 +01:00
parent 6e0b16ed1a
commit f50c696253
No known key found for this signature in database
GPG key ID: 00135ACBD90B28DD
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gravity.sh
View file

@ -414,7 +414,7 @@ gravity_DownloadBlocklists() {
echo -e " ${INFO} Storing gravity database in ${COL_BOLD}${gravityDBfile}${COL_NC}" echo -e " ${INFO} Storing gravity database in ${COL_BOLD}${gravityDBfile}${COL_NC}"
fi fi
local url domain str target compression adlist_type directory local url domain str target compression adlist_type directory curlVersion
echo "" echo ""
# Prepare new gravity database # Prepare new gravity database
@ -496,7 +496,8 @@ gravity_DownloadBlocklists() {
# Use compression to reduce the amount of data that is transferred # Use compression to reduce the amount of data that is transferred
# between the Pi-hole and the ad list provider. Use this feature # between the Pi-hole and the ad list provider. Use this feature
# only if it is supported by the locally available version of curl # only if it is supported by the locally available version of curl
if curl -V | grep -q "Features:.* libz"; then curlVersion=$(curl -V)
if echo "${curlVersion}" | grep -q "Features:.* libz"; then
compression="--compressed" compression="--compressed"
echo -e " ${INFO} Using libz compression\n" echo -e " ${INFO} Using libz compression\n"
else else
@ -508,11 +509,11 @@ gravity_DownloadBlocklists() {
# comparing the version string being >= 7.68.0 (released Jan 2020) # comparing the version string being >= 7.68.0 (released Jan 2020)
# https://github.com/curl/curl/pull/4543 followed by # https://github.com/curl/curl/pull/4543 followed by
# https://github.com/curl/curl/pull/4678 # https://github.com/curl/curl/pull/4678
if curl -V | grep -q "curl 7\.[6-9][8-9]"; then if echo "${curlVersion}" | grep -q "curl 7\.[6-9][8-9]"; then
etag_support=true etag_support=true
else else
# Check if the version is >= 8 # Check if the version is >= 8
if curl -V | grep -q "curl 8"; then if echo "${curlVersion}" | grep -q "curl 8"; then
etag_support=true etag_support=true
fi fi
fi fi