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

Commit 83c940ed authored by Sahil Sonar's avatar Sahil Sonar 💬
Browse files

flash: Refactor find_device() func 

  - If PRODUCT_ID_OLD was unbound, it would match ANY device
    & allows flashing wrong fw.
parent c356de77

flash/factory.common

+15 −2
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ fi 
# Check for connected phone

find_device() {

  echo "INFO: Looking for connected device(s)..."

  PRODUCT="${PRODUCT:-unknown}"

  PRODUCT_ID="${PRODUCT_ID:-unknown}"

  PRODUCT_ID_OLD="${PRODUCT_ID_OLD:-unknown}"

  DEVICE_FOUND="false"

  while [ ${DEVICE_FOUND} = "false" ]

  do
@@ -81,8 +84,18 @@ find_device() { 
      # Checking the product ID

      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

      matched=false

      if [[ "${PRODUCT_ID}" != "unknown" ]]; then

        if [[ ${PRODUCT_STRING} == *"${PRODUCT_ID}"* ]]; then

          matched=true

        fi

      fi

      if [[ "${PRODUCT_ID_OLD}" != "unknown" ]]; then

        if [[ ${PRODUCT_STRING} == *"${PRODUCT_ID_OLD}"* ]]; then

          matched=true

        fi

      fi

      if [[ "${matched}" == "true" ]]; then

        serial_numbers="${serial_numbers} $sn"

      fi

    done