From 0a2e1330c256160b061562f558e553212fc36387 Mon Sep 17 00:00:00 2001
From: Martin Kepplinger <martin.kepplinger@puri.sm>
Date: Thu, 18 Feb 2021 08:57:49 +0100
Subject: [PATCH] external: use flashrom from whereis

---
 x230/external_install_bottom.sh  | 12 ++++++------
 x230/external_install_top.sh     | 14 ++++++++------
 x230t/external_install_bottom.sh | 12 ++++++------
 x230t/external_install_top.sh    | 14 ++++++++------
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/x230/external_install_bottom.sh b/x230/external_install_bottom.sh
index ae9df45..2885706 100755
--- a/x230/external_install_bottom.sh
+++ b/x230/external_install_bottom.sh
@@ -8,6 +8,7 @@ NC='\033[0m'
 set -e
 
 cd "$(dirname "$0")"
+source "util/functions.sh"
 
 IFDTOOL=./util/ifdtool/ifdtool
 ME_CLEANER_PATH=./util/me_cleaner/me_cleaner.py
@@ -87,7 +88,6 @@ do
 	shift
 done
 
-command -v flashrom >/dev/null 2>&1 || { echo -e >&2 "${RED}Please install flashrom and run as root${NC}."; exit 1; }
 command -v make >/dev/null 2>&1 || { echo -e >&2 "${RED}Please install make and a C compiler${NC}."; exit 1; }
 command -v mktemp >/dev/null 2>&1 || { echo -e >&2 "${RED}Please install mktemp (coreutils)${NC}."; exit 1; }
 
@@ -142,7 +142,7 @@ fi
 
 if [ ! "$have_chipname" -gt 0 ] ; then
 	echo "trying to detect the chip..."
-	flashrom -p ${programmer} &> "${TEMP_DIR}"/chips || true
+	${FLASHROM} -p ${programmer} &> "${TEMP_DIR}"/chips || true
 	flashrom_error=""
 	flashrom_error=$(cat "${TEMP_DIR}"/chips | grep -i error || true)
 	if [ ! -z "${flashrom_error}" ] ; then
@@ -178,7 +178,7 @@ if [ ! "$have_chipname" -gt 0 ] ; then
 
 	if [ ! "$chip_found" -gt 0 ] ; then
 		echo "chip not detected."
-		flashrom -p ${programmer} || true
+		${FLASHROM} -p ${programmer} || true
 		rm -rf "${TEMP_DIR}"
 		echo "chip not detected. Please find it manually and rerun with the -c parameter."
 		exit 1
@@ -214,8 +214,8 @@ if [ "$me_clean" -gt 0 ] ; then
 fi
 
 echo "Start reading 2 times. Please be patient..."
-flashrom -p ${programmer} -c ${CHIPNAME} -r "${TEMP_DIR}"/test1.rom
-flashrom -p ${programmer} -c ${CHIPNAME} -r "${TEMP_DIR}"/test2.rom
+${FLASHROM} -p ${programmer} -c ${CHIPNAME} -r "${TEMP_DIR}"/test1.rom
+${FLASHROM} -p ${programmer} -c ${CHIPNAME} -r "${TEMP_DIR}"/test2.rom
 cmp --silent "${TEMP_DIR}"/test1.rom "${TEMP_DIR}"/test2.rom
 if [ "$have_backupname" -gt 0 ] ; then
 	cp "${TEMP_DIR}"/test1.rom "${BACKUPNAME}"
@@ -260,6 +260,6 @@ make clean -C util/ifdtool
 
 echo "start writing..."
 
-flashrom -p ${programmer} -c "${CHIPNAME}" -w "${TEMP_DIR}"/work.rom.new
+${FLASHROM} -p ${programmer} -c "${CHIPNAME}" -w "${TEMP_DIR}"/work.rom.new
 rm -rf "${TEMP_DIR}"
 echo -e "${GREEN}DONE${NC}"
diff --git a/x230/external_install_top.sh b/x230/external_install_top.sh
index b26216c..59764f4 100755
--- a/x230/external_install_top.sh
+++ b/x230/external_install_top.sh
@@ -7,6 +7,9 @@ NC='\033[0m'
 
 set -e
 
+cd "$(dirname "$0")"
+source "util/functions.sh"
+
 have_input_image=0
 have_chipname=0
 have_backupname=0
@@ -79,7 +82,6 @@ do
 	shift
 done
 
-command -v flashrom >/dev/null 2>&1 || { echo -e >&2 "${RED}Please install flashrom and run as root${NC}."; exit 1; }
 command -v mktemp >/dev/null 2>&1 || { echo -e >&2 "${RED}Please install mktemp (coreutils)${NC}."; exit 1; }
 
 if [ ! "$have_input_image" -gt 0 ] ; then
@@ -154,7 +156,7 @@ fi
 
 if [ ! "$have_chipname" -gt 0 ] ; then
 	echo "trying to detect the chip..."
-	flashrom -p ${programmer} &> "${TEMP_DIR}"/chips || true
+	${FLASHROM} -p ${programmer} &> "${TEMP_DIR}"/chips || true
 	flashrom_error=""
 	flashrom_error=$(cat "${TEMP_DIR}"/chips | grep -i error || true)
 	if [ ! -z "${flashrom_error}" ] ; then
@@ -181,7 +183,7 @@ if [ ! "$have_chipname" -gt 0 ] ; then
 
 	if [ ! "$chip_found" -gt 0 ] ; then
 		echo "chip not detected."
-		flashrom -p ${programmer} || true
+		${FLASHROM} -p ${programmer} || true
 		rm -rf "${TEMP_DIR}"
 		echo "Please find it manually in the list above and rerun with the -c parameter."
 		exit 1
@@ -199,8 +201,8 @@ if [ ! "$INPUT_IMAGE_SIZE" -eq "$reference_filesize" ] ; then
 fi
 
 echo "verifying SPI connection by reading 2 times. please wait."
-flashrom -p ${programmer} -c ${CHIPNAME} -r ${TEMP_DIR}/test1.rom
-flashrom -p ${programmer} -c ${CHIPNAME} -r ${TEMP_DIR}/test2.rom
+${FLASHROM} -p ${programmer} -c ${CHIPNAME} -r ${TEMP_DIR}/test1.rom
+${FLASHROM} -p ${programmer} -c ${CHIPNAME} -r ${TEMP_DIR}/test2.rom
 cmp --silent "${TEMP_DIR}"/test1.rom "${TEMP_DIR}"/test2.rom
 if [ "$have_backupname" -gt 0 ] ; then
 	cp "${TEMP_DIR}"/test1.rom "${BACKUPNAME}"
@@ -215,5 +217,5 @@ fi
 rm -rf "${TEMP_DIR}"
 
 echo -e "${GREEN}connection ok${NC}. flashing ${INPUT_IMAGE_NAME}"
-flashrom -p ${programmer} -c "${CHIPNAME}" -w "${INPUT_IMAGE_PATH}"
+${FLASHROM} -p ${programmer} -c "${CHIPNAME}" -w "${INPUT_IMAGE_PATH}"
 echo -e "${GREEN}DONE${NC}"
diff --git a/x230t/external_install_bottom.sh b/x230t/external_install_bottom.sh
index 57ea671..1c6511a 100755
--- a/x230t/external_install_bottom.sh
+++ b/x230t/external_install_bottom.sh
@@ -8,6 +8,7 @@ NC='\033[0m'
 set -e
 
 cd "$(dirname "$0")"
+source "util/functions.sh"
 
 IFDTOOL=./util/ifdtool/ifdtool
 ME_CLEANER_PATH=./util/me_cleaner/me_cleaner.py
@@ -87,7 +88,6 @@ do
 	shift
 done
 
-command -v flashrom >/dev/null 2>&1 || { echo -e >&2 "${RED}Please install flashrom and run as root${NC}."; exit 1; }
 command -v make >/dev/null 2>&1 || { echo -e >&2 "${RED}Please install make and a C compiler${NC}."; exit 1; }
 command -v mktemp >/dev/null 2>&1 || { echo -e >&2 "${RED}Please install mktemp (coreutils)${NC}."; exit 1; }
 
@@ -142,7 +142,7 @@ fi
 
 if [ ! "$have_chipname" -gt 0 ] ; then
 	echo "trying to detect the chip..."
-	flashrom -p ${programmer} &> "${TEMP_DIR}"/chips || true
+	${FLASHROM} -p ${programmer} &> "${TEMP_DIR}"/chips || true
 	flashrom_error=""
 	flashrom_error=$(cat "${TEMP_DIR}"/chips | grep -i error || true)
 	if [ ! -z "${flashrom_error}" ] ; then
@@ -178,7 +178,7 @@ if [ ! "$have_chipname" -gt 0 ] ; then
 
 	if [ ! "$chip_found" -gt 0 ] ; then
 		echo "chip not detected."
-		flashrom -p ${programmer} || true
+		${FLASHROM} -p ${programmer} || true
 		rm -rf "${TEMP_DIR}"
 		echo "chip not detected. Please find it manually and rerun with the -c parameter."
 		exit 1
@@ -214,8 +214,8 @@ if [ "$me_clean" -gt 0 ] ; then
 fi
 
 echo "Start reading 2 times. Please be patient..."
-flashrom -p ${programmer} -c ${CHIPNAME} -r "${TEMP_DIR}"/test1.rom
-flashrom -p ${programmer} -c ${CHIPNAME} -r "${TEMP_DIR}"/test2.rom
+${FLASHROM} -p ${programmer} -c ${CHIPNAME} -r "${TEMP_DIR}"/test1.rom
+${FLASHROM} -p ${programmer} -c ${CHIPNAME} -r "${TEMP_DIR}"/test2.rom
 cmp --silent "${TEMP_DIR}"/test1.rom "${TEMP_DIR}"/test2.rom
 if [ "$have_backupname" -gt 0 ] ; then
 	cp "${TEMP_DIR}"/test1.rom "${BACKUPNAME}"
@@ -260,6 +260,6 @@ make clean -C util/ifdtool
 
 echo "start writing..."
 
-flashrom -p ${programmer} -c "${CHIPNAME}" -w "${TEMP_DIR}"/work.rom.new
+${FLASHROM} -p ${programmer} -c "${CHIPNAME}" -w "${TEMP_DIR}"/work.rom.new
 rm -rf "${TEMP_DIR}"
 echo -e "${GREEN}DONE${NC}"
diff --git a/x230t/external_install_top.sh b/x230t/external_install_top.sh
index fb5633b..42b4f26 100755
--- a/x230t/external_install_top.sh
+++ b/x230t/external_install_top.sh
@@ -7,6 +7,9 @@ NC='\033[0m'
 
 set -e
 
+cd "$(dirname "$0")"
+source "util/functions.sh"
+
 have_input_image=0
 have_chipname=0
 have_backupname=0
@@ -79,7 +82,6 @@ do
 	shift
 done
 
-command -v flashrom >/dev/null 2>&1 || { echo -e >&2 "${RED}Please install flashrom and run as root${NC}."; exit 1; }
 command -v mktemp >/dev/null 2>&1 || { echo -e >&2 "${RED}Please install mktemp (coreutils)${NC}."; exit 1; }
 
 if [ ! "$have_input_image" -gt 0 ] ; then
@@ -154,7 +156,7 @@ fi
 
 if [ ! "$have_chipname" -gt 0 ] ; then
 	echo "trying to detect the chip..."
-	flashrom -p ${programmer} &> "${TEMP_DIR}"/chips || true
+	${FLASHROM} -p ${programmer} &> "${TEMP_DIR}"/chips || true
 	flashrom_error=""
 	flashrom_error=$(cat "${TEMP_DIR}"/chips | grep -i error || true)
 	if [ ! -z "${flashrom_error}" ] ; then
@@ -181,7 +183,7 @@ if [ ! "$have_chipname" -gt 0 ] ; then
 
 	if [ ! "$chip_found" -gt 0 ] ; then
 		echo "chip not detected."
-		flashrom -p ${programmer} || true
+		${FLASHROM} -p ${programmer} || true
 		rm -rf "${TEMP_DIR}"
 		echo "Please find it manually in the list above and rerun with the -c parameter."
 		exit 1
@@ -199,8 +201,8 @@ if [ ! "$INPUT_IMAGE_SIZE" -eq "$reference_filesize" ] ; then
 fi
 
 echo "verifying SPI connection by reading 2 times. please wait."
-flashrom -p ${programmer} -c ${CHIPNAME} -r ${TEMP_DIR}/test1.rom
-flashrom -p ${programmer} -c ${CHIPNAME} -r ${TEMP_DIR}/test2.rom
+${FLASHROM} -p ${programmer} -c ${CHIPNAME} -r ${TEMP_DIR}/test1.rom
+${FLASHROM} -p ${programmer} -c ${CHIPNAME} -r ${TEMP_DIR}/test2.rom
 cmp --silent "${TEMP_DIR}"/test1.rom "${TEMP_DIR}"/test2.rom
 if [ "$have_backupname" -gt 0 ] ; then
 	cp "${TEMP_DIR}"/test1.rom "${BACKUPNAME}"
@@ -215,5 +217,5 @@ fi
 rm -rf "${TEMP_DIR}"
 
 echo -e "${GREEN}connection ok${NC}. flashing ${INPUT_IMAGE_NAME}"
-flashrom -p ${programmer} -c "${CHIPNAME}" -w "${INPUT_IMAGE_PATH}"
+${FLASHROM} -p ${programmer} -c "${CHIPNAME}" -w "${INPUT_IMAGE_PATH}"
 echo -e "${GREEN}DONE${NC}"