From af29f112ababf4fe3c872ae8050c6ff2aa1269b1 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 1 Apr 2023 03:36:41 +0100
Subject: blobutil: rename variables to make more sense

for example, files being downloaded have nothing to do
with the ME; they are merely compressed, and contain many
files in addition to it
---
 resources/blobs/sources          | 18 +++++++++---------
 resources/scripts/blobs/download | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/resources/blobs/sources b/resources/blobs/sources
index 56d7ada1..e97eb674 100644
--- a/resources/blobs/sources
+++ b/resources/blobs/sources
@@ -6,19 +6,19 @@
 # list hashes as sha1 sums.
 
 {x230 x230t x230i x230edp t430 t530 w530}{
-	ME_hash 039c89c6d44ae11ae2510cbd5fed756e97ed9a31
-	ME_dl https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe
-	ME_bkup_dl https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe
+	DL_hash 039c89c6d44ae11ae2510cbd5fed756e97ed9a31
+	DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe
+	DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe
 }
 
 {x220 x220t t420 t520 t420s}{
-	ME_hash fa0f96c8f36646492fb8c57ad3296bf5f647d9c5
-	ME_dl https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe
-	ME_bkup_dl https://web.archive.org/web/20220202201637/https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe
+	DL_hash fa0f96c8f36646492fb8c57ad3296bf5f647d9c5
+	DL_url https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe
+	DL_url_bkup https://web.archive.org/web/20220202201637/https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe
 }
 
 {t440pmrc w541mrc t440p w541}{
-	ME_hash b2f2a1baa1f0c8139e46b0d3e206386ff197bed5
-	ME_dl https://download.lenovo.com/pccbbs/mobiles/glrg22ww.exe
-	ME_bkup_dl https://web.archive.org/web/20211120031520/https://download.lenovo.com/pccbbs/mobiles/glrg22ww.exe
+	DL_hash b2f2a1baa1f0c8139e46b0d3e206386ff197bed5
+	DL_url https://download.lenovo.com/pccbbs/mobiles/glrg22ww.exe
+	DL_url_bkup https://web.archive.org/web/20211120031520/https://download.lenovo.com/pccbbs/mobiles/glrg22ww.exe
 }
diff --git a/resources/scripts/blobs/download b/resources/scripts/blobs/download
index 186755dc..5f6cc12d 100755
--- a/resources/scripts/blobs/download
+++ b/resources/scripts/blobs/download
@@ -38,7 +38,7 @@ Extract_me(){
 		return 0
 	fi
 
-	if [ -z "${me_dl+x}" ]; then
+	if [ -z "${dl_url+x}" ]; then
 		printf 'no me download available for this board\n'
 		return 1
 	fi
@@ -58,9 +58,9 @@ Extract_me(){
 		rm -r blobs/app
 	fi
 
-	curl ${me_dl} > blobs/me.exe || curl ${me_dl_bkup} > blobs/me.exe
+	curl ${dl_url} > blobs/me.exe || curl ${dl_url_bkup} > blobs/me.exe
 
-	if [ "$(sha1sum blobs/me.exe | awk '{print $1}')" != "${me_hash}" ]; then
+	if [ "$(sha1sum blobs/me.exe | awk '{print $1}')" != "${dl_hash}" ]; then
 		printf 'checksum of downloaded me did not mactch\ncorrupted me downloaded or wrong me for board\n'
 		rm blobs/me.exe
 		return 1
@@ -125,17 +125,17 @@ Build_deps
 
 while read -r line ; do
 	case ${line} in
-		ME_hash*)
+		DL_hash*)
 		set ${line}
-		me_hash=${2}
+		dl_hash=${2}
 		;;
-		ME_dl*)
+		DL_url*)
 		set ${line}
-		me_dl=${2}
+		dl_url=${2}
 		;;
-		ME_bkup_dl*)
+		DL_url_bkup*)
 		set ${line}
-		me_dl_bkup=${2}
+		dl_url_bkup=${2}
 		;;
 	esac
 done << EOF
-- 
cgit v1.2.1