Due to how GitHub works, always unconditionally upgrade

Author: ayufan

package/root/usr/local/sbin/pine64_update_kernel.sh

@@ -19,23 +19,6 @@ if [ -z "$1" ]; then
 	echo "Using latest release: $VERSION."
 fi
 
-VARIANTFILE="/var/lib/misc/pine64_update_kernel.variant"
-VARIANT=""
-if [ -e "$VARIANTFILE" ]; then
-	VARIANT=$(cat $VARIANTFILE)
-fi
-
-if [ -n "$2" ]; then
-	VARIANT="$2"
-	if [ "$VARIANT" = "default" ]; then
-		VARIANT=""
-	fi
-fi
-
-if [ -n "$VARIANT" ]; then
-	echo "Using Kernel variant: $VARIANT"
-fi
-
 URL="https://github.com/ayufan-pine64/linux-build/releases/download/$VERSION/linux-pine64-$VERSION.tar.xz"
 # URL="https://www.stdin.xyz/downloads/people/longsleep/pine64-images/linux/linux-pine64$VARIANT-$VERSION.tar.xz"
 # PUBKEY="https://www.stdin.xyz/downloads/people/longsleep/longsleep.asc"
@@ -55,20 +38,6 @@ if [ -e "${CURRENTFILE}" ]; then
 	CURRENT=$(cat $CURRENTFILE)
 fi
 
-echo "Checking for update ..."
-ETAG=$(curl -f -I -H "If-None-Match: \"${CURRENT}\"" -s "${URL}"|grep ETag|awk -F'"' '{print $2}')
-
-if [ -z "$ETAG" ]; then
-	echo "Version $VERSION$VARIANT not found."
-	exit 1
-fi
-
-ETAG="$ETAG$VARIANT"
-if [ "$ETAG" = "$CURRENT" ]; then
-	echo "You are already on $VERSION version - abort."
-	exit 0
-fi
-
 FILENAME=$TEMP/$(basename ${URL})
 
 downloadAndApply() {
@@ -126,5 +95,4 @@ else
 	echo "Mark only."
 fi
 echo "$ETAG" > "$CURRENTFILE"
-echo "$VARIANT" > "$VARIANTFILE"
 sync

package/root/usr/local/sbin/pine64_update_package.sh

@@ -15,8 +15,7 @@ if [ -z "$1" ]; then
 fi
 
 DEVICE="/dev/mmcblk0"
-URL="https://github.com/ayufan-pine64/linux-build/releases/download/$VERSION/linux-pine64-package-$(cat /etc/pine64_model)-$VERSION.deb"
-CURRENTFILE="/var/lib/misc/pine64_update_package.status"
+URL="https://github.com/ayufan-pine64/linux-build/releases/download/$VERSION/linux-pine64-package-$VERSION.deb"
 
 if [ "$(id -u)" -ne "0" ]; then
 	echo "This script requires root."
@@ -38,26 +37,14 @@ if [ -e "${CURRENTFILE}" ]; then
 fi
 
 echo "Checking for update ..."
-ETAG=$(curl -L -f -I -H "If-None-Match: \"${CURRENT}\"" -s "${URL}"|grep ETag|awk -F'"' '{print $2}')
-
-if [ -z "$ETAG" ]; then
-	echo "Version $VERSION not found."
-	exit 1
-fi
-
-if [ "$ETAG" = "$CURRENT" ]; then
-	echo "You are already on $VERSION version - abort."
-	exit 0
-fi
-
 FILENAME=$TEMP/$(basename ${URL})
 
 if [ -z "$MARK_ONLY" ]; then
 	echo "Downloading model package ..."
 	curl -L "${URL}" -f --progress-bar --output "${FILENAME}"
 
     echo "Installing model package ..."
-    dpkg -i "${FILENAME}"
+    sudo dpkg -i "${FILENAME}"
 
 	echo "Done - you should reboot now."
 else

package/root/usr/local/sbin/pine64_update_uboot.sh

@@ -39,19 +39,6 @@ if [ -e "${CURRENTFILE}" ]; then
 	CURRENT=$(cat $CURRENTFILE)
 fi
 
-echo "Checking for update ..."
-ETAG=$(curl -f -I -H "If-None-Match: \"${CURRENT}\"" -s "${URL}"|grep ETag|awk -F'"' '{print $2}')
-
-if [ -z "$ETAG" ]; then
-	echo "Version $VERSION not found."
-	exit 1
-fi
-
-if [ "$ETAG" = "$CURRENT" ]; then
-	echo "You are already on $VERSION version - abort."
-	exit 0
-fi
-
 FILENAME=$TEMP/$(basename ${URL})
 
 downloadAndApply() {