Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9ee5fb2 authored by Frank Preel's avatar Frank Preel
Browse files

Merge remote-tracking branch 'origin/release-1.4.0' into release-1.4.0

parents fc3b61f4 74a8bd31

flash-scripts/linux/install-e-recovery-boot.sh

+0 −15
Original line number Diff line number Diff line
@@ -40,25 +40,10 @@ then 
  	exit 102

fi



#"$FASTBOOT_CMD" reboot bootloader

#sleep 10



# Build fastboot and adb commands

FASTBOOT_CMD=${FASTBOOT_PATH}"fastboot"

ADB_CMD=${FASTBOOT_PATH}"adb"



# Wipe user data

#if ! "$FASTBOOT_CMD" erase userdata ;

#then 

#  exit 11

#fi



#echo "user data wiped"

#sleep 1



#if ! "$FASTBOOT_CMD" erase metadata ;

#then 

#  exit 12

#fi



"$FASTBOOT_CMD" flash boot ${E_IMAGE_PATH}

flash-scripts/linux/install-e-recovery.sh

+0 −15
Original line number Diff line number Diff line
@@ -38,25 +38,10 @@ then 
  	exit 102

fi



#"$FASTBOOT_CMD" reboot bootloader

#sleep 10



# Build fastboot and adb commands

FASTBOOT_CMD=${FASTBOOT_PATH}"fastboot"

ADB_CMD=${FASTBOOT_PATH}"adb"



# Wipe user data

#if ! "$FASTBOOT_CMD" erase userdata ;

#then 

#  exit 11

#fi



#echo "user data wiped"

#sleep 1



#if ! "$FASTBOOT_CMD" erase metadata ;

#then 

#  exit 12

#fi



"$FASTBOOT_CMD" flash recovery ${E_IMAGE_PATH}

flash-scripts/windows/install-e-recovery-boot.bat

+0 −11
Original line number Diff line number Diff line
@@ -40,16 +40,5 @@ IF not defined %E_IMAGE_PATH ( 
SET FASTBOOT_CMD="%FASTBOOT_PATH%fastboot"

SET ADB_CMD="%FASTBOOT_PATH%adb"



:: %FASTBOOT_CMD% erase userdata

:: if errorlevel 1 ( 

:: 	exit /b 11 

:: )



:: timeout 1 >nul 2>&1



:: %FASTBOOT_CMD% erase metadata

:: if errorlevel 1 ( 

:: 	exit /b 12 

:: )



%FASTBOOT_CMD% flash boot %E_IMAGE_PATH%

flash-scripts/windows/install-e-recovery.bat

+0 −11
Original line number Diff line number Diff line
@@ -40,16 +40,5 @@ IF not defined %E_IMAGE_PATH ( 
SET FASTBOOT_CMD="%FASTBOOT_PATH%fastboot"

SET ADB_CMD="%FASTBOOT_PATH%adb"



:: %FASTBOOT_CMD% erase userdata

:: if errorlevel 1 ( 

:: 	exit /b 11 

:: )



:: timeout 1 >nul 2>&1



:: %FASTBOOT_CMD% erase metadata

:: if errorlevel 1 ( 

:: 	exit /b 12 

:: )



%FASTBOOT_CMD% flash recovery %E_IMAGE_PATH%

flash-scripts/windows/install-from-e-recovery.bat

+0 −10
Original line number Diff line number Diff line
@@ -29,16 +29,6 @@ SET DEVICE_ID=%~1 
SET ARCHIVE_FILE=%~2

SET FASTBOOT_FOLDER_PATH=%~3



::IF "-z" "%DEVICE_ID%" (

::  exit "101"

::)

::IF "-z" "%ARCHIVE_FILE%" (

::  exit "102"

::)

::IF "-z" "%FASTBOOT_FOLDER_PATH%" (

::  exit "103"

::)



SET ADB_CMD="%FASTBOOT_FOLDER_PATH%adb"

"%ADB_CMD%" "sideload" "%ARCHIVE_FILE%"

if errorlevel==0 (