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

Commit 0b81a7ae authored by Rohit Sekhar's avatar Rohit Sekhar
Browse files

flash_FP{3,4}_factory.sh: Properly quote $FASTBOOT_BIN 

* Otherwise flashing from paths with spaces will error out
parent bd4495c1

flash_FP3_factory.sh

+4 −4
Original line number Diff line number Diff line
@@ -41,10 +41,10 @@ find_device() { 
  do

    serial_numbers=



    for sn in $(${FASTBOOT_BIN} devices | grep fastboot | grep -oE '^[[:alnum:]]+')

    for sn in $("${FASTBOOT_BIN}" devices | grep fastboot | grep -oE '^[[:alnum:]]+')

    do

      # Checking the product ID

      PRODUCT_STRING=$(${FASTBOOT_BIN} -s "${sn}" getvar product 2>&1)

      PRODUCT_STRING=$("${FASTBOOT_BIN}" -s "${sn}" getvar product 2>&1)

      # Add serial, if product matches

      if [[ ${PRODUCT_STRING} == *"${PRODUCT_ID}"* ]] || [[ ${PRODUCT_STRING} == *"${PRODUCT_ID_OLD}"* ]]

      then
@@ -114,7 +114,7 @@ flash_device() { 
    flash_image_or_abort "${sn}" userdata "${IMAGES_DIR}/userdata.img"

  fi



  $FASTBOOT_BIN -s "${sn}" --set-active=a

  "$FASTBOOT_BIN" -s "${sn}" --set-active=a



  echo "INFO: Locking bootloader"

  "${FASTBOOT_BIN}" -s "${sn}" oem lock
@@ -134,7 +134,7 @@ flash_device() { 
# Arguments: <device serial number> <partition name> <image file>

flash_image_or_abort() {

  local retval=0

  $FASTBOOT_BIN -s "${1}" flash "${2}" "${3}" || retval=$?

  "$FASTBOOT_BIN" -s "${1}" flash "${2}" "${3}" || retval=$?



  if [ "${retval}" -ne 0 ]

  then

flash_FP4_factory.sh

+6 −6
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@ find_device() { 
  do

    serial_numbers=



    for sn in $(${FASTBOOT_BIN} devices | grep fastboot | grep -oE '^[[:alnum:]]+')

    for sn in $("${FASTBOOT_BIN}" devices | grep fastboot | grep -oE '^[[:alnum:]]+')

    do

      # Checking the product ID

      PRODUCT_STRING=$(${FASTBOOT_BIN} -s "${sn}" getvar product 2>&1)

      PRODUCT_STRING=$("${FASTBOOT_BIN}" -s "${sn}" getvar product 2>&1)

      # Add serial, if product matches

      if [[ ${PRODUCT_STRING} == *"${PRODUCT_ID}"* ]] || [[ ${PRODUCT_STRING} == *"${PRODUCT_ID_OLD}"* ]]

      then
@@ -111,10 +111,10 @@ flash_device() { 
  flash_image_ab_or_abort "${sn}" xbl_config "${IMAGES_DIR}/xbl_config.img"

  flash_image_ab_or_abort "${sn}" core_nhlos "${IMAGES_DIR}/core_nhlos.img"



  $FASTBOOT_BIN -s "${sn}" erase userdata

  $FASTBOOT_BIN -s "${sn}" erase metadata

  "$FASTBOOT_BIN" -s "${sn}" erase userdata

  "$FASTBOOT_BIN" -s "${sn}" erase metadata



  $FASTBOOT_BIN -s "${sn}" --set-active=a

  "$FASTBOOT_BIN" -s "${sn}" --set-active=a



}
@@ -122,7 +122,7 @@ flash_device() { 
# Arguments: <device serial number> <partition name> <image file>

flash_image_or_abort() {

  local retval=0

  $FASTBOOT_BIN -s "${1}" flash "${2}" "${3}" || retval=$?

  "$FASTBOOT_BIN" -s "${1}" flash "${2}" "${3}" || retval=$?



  if [ "${retval}" -ne 0 ]

  then