Merge pull request #30 from macmpi/dev

version 1.2.2

Author: macmpi

headless.apkovl.tar.gz

@@ -1 +1 @@
-7ba93d6c47ada0f1ddf89d55be49342df16fec1e2e1ac38a09e82f34248a86f953d9efbac0eeba472e33d03d85f8fe8e65cb88c914fac1268e932cc39e558f4b  headless.apkovl.tar.gz
+d30ebaec4e1e9224e0a4a34861f392ba41adf585cdf6e3ede41492fb6a55a0c881455a510663422b77cb42a5b48a02fc17d62fafc74df6c49e324639b25ba337  headless.apkovl.tar.gz

headless.apkovl.tar.gz.sha512

@@ -3,7 +3,7 @@
 # SPDX-FileCopyrightText: Copyright 2022-2023, macmpi
 # SPDX-License-Identifier: MIT
 
-HDLSBSTRP_VERSION="1.2.1"
+HDLSBSTRP_VERSION="1.2.2"
 
 _apk() {
 	local cmd="$1"
@@ -150,18 +150,20 @@ local file_url="https://is.gd/apkovl_master"
 local sha_url="https://github.com/macmpi/alpine-linux-headless-bootstrap/raw/main/headless.apkovl.tar.gz.sha512"
 local updt_status="failed, keeping original version"
 
-if wget -q -O /tmp/apkovl -T 10 "$file_url" >/dev/null 2>&1 && \
+# Ensure system date is correct to allow SSL transactions
+ntpd -N -p pool.ntp.org -n -q
+
+_is_ro && mount -o remount,rw "${ovlpath}"
+if wget -q -O "${ovl}_new" -T 10 "$file_url" >/dev/null 2>&1 && \
 	wget -q -O /tmp/sha -T 10 "$sha_url" >/dev/null 2>&1 && \
-	[ "$( sha512sum /tmp/apkovl | awk '{print $1}' )" = "$( awk '{print $1}' /tmp/sha )" ]; then
-		_is_ro && mount -o remount,rw "${ovlpath}"
-		cp /tmp/apkovl "${ovl}"
-		_is_ro && mount -o remount,ro "${ovlpath}"
-		! [ "$( sha512sum "${ovl}" | awk '{print $1}' )" = "$( awk '{print $1}' /tmp/sha )" ] && \
-			_logger "Bad update: original apkovl file may be altered, please check!..." && return 1
+	[ "$( sha512sum "${ovl}_new" | awk '{print $1}' )" = "$( awk '{print $1}' /tmp/sha )" ]; then
+		mv -f "${ovl}_new" "${ovl}"
 		updt_status="successful"
 fi
-rm -f /tmp/apkovl /tmp/sha
+rm -f "${ovl}_new" /tmp/sha
+_is_ro && mount -o remount,ro "${ovlpath}"
 _logger "Update $updt_status"
+
 if [ "$updt_status" = "successful" ]; then
 	printf '%s\n\n' "Updated" >>/tmp/.trash/banner
 else
@@ -185,7 +187,7 @@ local vers=""
 local ref="/macmpi/alpine-linux-headless-bootstrap/releases/tag/v"
 local url="https://is.gd/apkovl_run"
 
-if wget -q -O /tmp/homepg -T 10 "$url" >/dev/null 2>&1; then
+if wget -q -O /tmp/homepg -T 10 --no-check-certificate "$url" >/dev/null 2>&1; then
 	_logger "Internet access: success"
 	vers="$( grep -o "$ref.*\"" /tmp/homepg | grep -Eo '[0-9]+[\.[0-9]+]*' )"
 	rm -f /tmp/homepg