update linux scripts to allow to specify a custom adb & heimdall path (5893bb9e) · Commits · e / tools / flash-scripts

linux/install-from-recovery.sh

+19 −6

Original line number	Original line	Diff line number	Diff line
	#!/bin/bash		#!/bin/bash

	# Copyright (C) 2019 ECORP SAS - Author: Romain Hunault		# Copyright (C) 2019 ECORP SAS - Author: Romain Hunault
			# Copyright (C) 2020 ECORP SAS - Author: Vincent Bourgmayer
	#		#
	# This program is free software: you can redistribute it and/or modify		# This program is free software: you can redistribute it and/or modify
	# it under the terms of the GNU General Public License as published by		# it under the terms of the GNU General Public License as published by
	@@ -18,6 +19,7 @@
	# Parameter		# Parameter
	# $1: DEVICE_ID device identifier		# $1: DEVICE_ID device identifier
	# $2: ARCHIVE_PATH path to the /e/ archive to flash		# $2: ARCHIVE_PATH path to the /e/ archive to flash
			# $3: ADB_FOLDER_PATH: the path where runnable adb is stored

	# Exit status		# Exit status
	# - 0 : /e/ installed		# - 0 : /e/ installed
	@@ -30,6 +32,17 @@
	DEVICE_ID=$1		DEVICE_ID=$1
	ARCHIVE_PATH=$2		ARCHIVE_PATH=$2
	ARCHIVE_NAME=$(basename $2)		ARCHIVE_NAME=$(basename $2)
			ADB_FOLDER_PATH=$3
			ADB_PATH=""


			if [ ! -z $ADB_FOLDER_PATH ]
			then
			ADB_PATH=${ADB_FOLDER_PATH}"adb"
			else
			ADB_PATH=adb
			fi


	if [ -z $DEVICE_ID ]		if [ -z $DEVICE_ID ]
	then		then
	@@ -41,19 +54,19 @@ then
	exit 102		exit 102
	fi		fi

	adb -s ${DEVICE_ID} shell twrp wipe system		$ADB_PATH -s ${DEVICE_ID} shell twrp wipe system
	adb -s ${DEVICE_ID} shell twrp wipe cache		$ADB_PATH -s ${DEVICE_ID} shell twrp wipe cache
	adb -s ${DEVICE_ID} shell twrp wipe data		$ADB_PATH -s ${DEVICE_ID} shell twrp wipe data
	adb -s ${DEVICE_ID} push ${ARCHIVE_PATH} /sdcard		$ADB_PATH -s ${DEVICE_ID} push ${ARCHIVE_PATH} /sdcard

	if [ $? != 0 ] ; then exit 2 ; fi		if [ $? != 0 ] ; then exit 2 ; fi

	adb -s ${DEVICE_ID} shell twrp install /sdcard/${ARCHIVE_NAME}		$ADB_PATH -s ${DEVICE_ID} shell twrp install /sdcard/${ARCHIVE_NAME}

	if [ $? != 0 ] ; then exit 3 ; fi		if [ $? != 0 ] ; then exit 3 ; fi

	sleep 1		sleep 1

	adb -s ${DEVICE_ID} shell rm /sdcard/${ARCHIVE_NAME}		$ADB_PATH -s ${DEVICE_ID} shell rm /sdcard/${ARCHIVE_NAME}

	sleep 1		sleep 1

linux/install-recovery.sh

+14 −1

Original line number	Original line	Diff line number	Diff line
	#!/bin/bash		#!/bin/bash

	# Copyright (C) 2019 ECORP SAS - Author: Romain Hunault		# Copyright (C) 2019 ECORP SAS - Author: Romain Hunault
			# Copyright (C) 2020 ECORP SAS - Author: Vincent Bourgmayer
	#		#
	# This program is free software: you can redistribute it and/or modify		# This program is free software: you can redistribute it and/or modify
	# it under the terms of the GNU General Public License as published by		# it under the terms of the GNU General Public License as published by
	@@ -17,6 +18,7 @@

	# Parameter		# Parameter
	# $1: TWRP_IMAGE_PATH need twrp path (${TWRP_FOLDER}/${TWRP})		# $1: TWRP_IMAGE_PATH need twrp path (${TWRP_FOLDER}/${TWRP})
			# $2: The folder where heimdall runnable is stored

	# Exit status		# Exit status
	# - 0 : Recovery installed		# - 0 : Recovery installed
	@@ -24,10 +26,21 @@
	# - 101 : TWRP_IMAGE_PATH missing		# - 101 : TWRP_IMAGE_PATH missing

	TWRP_IMAGE_PATH=$1		TWRP_IMAGE_PATH=$1
			HEIMDALL_FOLDER_PATH=$2
			HEIMDALL_PATH=""


			if [ ! -z $HEIMDALL_FOLDER_PATH ]
			then
			HEIMDALL_PATH=${HEIMDALL_FOLDER_PATH}"heimdall"
			else
			HEIMDALL_PATH=heimdall
			fi


	if [ -z $TWRP_IMAGE_PATH ]		if [ -z $TWRP_IMAGE_PATH ]
	then		then
	exit 101		exit 101
	fi		fi

	heimdall flash --RECOVERY ${TWRP_IMAGE_PATH} --no-reboot		$HEIMDALL_PATH flash --RECOVERY ${TWRP_IMAGE_PATH} --no-reboot

linux/oem-unlock.sh

+16 −1

Original line number	Original line	Diff line number	Diff line
	#!/bin/bash		#!/bin/bash

	# Copyright (C) 2019 ECORP SAS - Author: Romain Hunault		# Copyright (C) 2019 ECORP SAS - Author: Romain Hunault
			# Copyright (C) 2020 ECORP SAS - Author: Vincent Bourgmayer
	#		#
	# This program is free software: you can redistribute it and/or modify		# This program is free software: you can redistribute it and/or modify
	# it under the terms of the GNU General Public License as published by		# it under the terms of the GNU General Public License as published by
	@@ -15,11 +16,25 @@
	# You should have received a copy of the GNU General Public License		# You should have received a copy of the GNU General Public License
	# along with this program. If not, see <https://www.gnu.org/licenses/>.		# along with this program. If not, see <https://www.gnu.org/licenses/>.

			# Parameter
			# $1: The folder where heimdall runnable is stored

	# Exit status		# Exit status
	# - 0 : OEM unlocked on device		# - 0 : OEM unlocked on device
	# - 10 : heimdall error		# - 10 : heimdall error

	heimdall print-pit		HEIMDALL_FOLDER_PATH=$1
			HEIMDALL_PATH=""


			if [ ! -z $HEIMDALL_FOLDER_PATH ]
			then
			HEIMDALL_PATH=${HEIMDALL_FOLDER_PATH}"heimdall"
			else
			HEIMDALL_PATH=heimdall
			fi

			$HEIMDALL_PATH print-pit

	if [ $? = 1 ]		if [ $? = 1 ]
	then		then

linux/wait-download.sh

+15 −1

Original line number	Original line	Diff line number	Diff line
	#!/bin/bash		#!/bin/bash

	# Copyright (C) 2019 ECORP SAS - Author: Romain Hunault		# Copyright (C) 2019 ECORP SAS - Author: Romain Hunault
			# Copyright (C) 2020 ECORP SAS - Author: Vincent Bourgmayer
	#		#
	# This program is free software: you can redistribute it and/or modify		# This program is free software: you can redistribute it and/or modify
	# it under the terms of the GNU General Public License as published by		# it under the terms of the GNU General Public License as published by
	@@ -16,12 +17,25 @@
	# along with this program. If not, see <https://www.gnu.org/licenses/>.		# along with this program. If not, see <https://www.gnu.org/licenses/>.

	# TODO: What if 2 devices detected?		# TODO: What if 2 devices detected?
			# Parameter
			# $1: The folder where heimdall runnable is stored

	# Exit status		# Exit status
	# - 0 : Device in download mode detected		# - 0 : Device in download mode detected
	# - 1 : Error		# - 1 : Error

	while [ "`heimdall detect > /dev/null 2>&1; echo $?`" = 1 ]		HEIMDALL_FOLDER_PATH=$1
			HEIMDALL_PATH=""


			if [ ! -z $HEIMDALL_FOLDER_PATH ]
			then
			HEIMDALL_PATH=${HEIMDALL_FOLDER_PATH}"heimdall"
			else
			HEIMDALL_PATH=heimdall
			fi

			while [ "`$HEIMDALL_PATH detect > /dev/null 2>&1; echo $?`" = 1 ]
	do		do
	sleep 1s		sleep 1s
	done		done

linux/wait-reboot.sh

+15 −2

Original line number	Original line	Diff line number	Diff line
	#!/bin/bash		#!/bin/bash

	# Copyright (C) 2019 ECORP SAS - Author: Romain Hunault		# Copyright (C) 2019 ECORP SAS - Author: Romain Hunault
			# Copyright (C) 2020 ECORP SAS - Author: Vincent Bourgmayer
	#		#
	# This program is free software: you can redistribute it and/or modify		# This program is free software: you can redistribute it and/or modify
	# it under the terms of the GNU General Public License as published by		# it under the terms of the GNU General Public License as published by
	@@ -17,6 +18,7 @@

	# Parameter		# Parameter
	# $1: DEVICE_ID Device we are waiting for reboot		# $1: DEVICE_ID Device we are waiting for reboot
			# $2: ADB_FOLDER_PATH: the path where runnable adb is stored

	# Exit status		# Exit status
	# - 0 : New device detected		# - 0 : New device detected
	@@ -25,6 +27,17 @@
	# - 101 : DEVICE_ID is not detected		# - 101 : DEVICE_ID is not detected

	DEVICE_ID=$1		DEVICE_ID=$1
			ADB_FOLDER_PATH=$2
			ADB_PATH=""


			if [ ! -z $ADB_FOLDER_PATH ]
			then
			ADB_PATH=${ADB_FOLDER_PATH}"adb"
			else
			ADB_PATH=adb
			fi


	if [ -z $DEVICE_ID ]		if [ -z $DEVICE_ID ]
	then		then
	@@ -33,14 +46,14 @@ fi


	#1 On check that device is in recovery mode		#1 On check that device is in recovery mode
	adb -s ${DEVICE_ID} get-state 2>&1 \| grep "recovery"		$ADB_PATH -s ${DEVICE_ID} get-state 2>&1 \| grep "recovery"
	if [ $? != 0 ]		if [ $? != 0 ]
	then		then
	exit 101		exit 101
	fi		fi

	#Then we wait that it left this state		#Then we wait that it left this state
	while adb -s ${DEVICE_ID} get-state 2> /dev/null		while $ADB_PATH -s ${DEVICE_ID} get-state 2> /dev/null
	do		do
	sleep 1		sleep 1
	done		done
			No newline at end of file