From da3b64413df413bc2e54790cff3fe8a5d6a8e313 Mon Sep 17 00:00:00 2001
From: Vladimir Oltean <olteanv@gmail.com>
Date: Sun, 24 Jun 2018 20:41:30 +0300
Subject: [PATCH] extract_utils: extract(): rename FILE variable to
 SPEC_SRC_FILE

* This is a cleanup patch.

Change-Id: I971b2b9eba5c1f303c0d5f902feaaad25b3b26ed
Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
---
 build/tools/extract_utils.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh
index e6be42b0..cf71f0ba 100644
--- a/build/tools/extract_utils.sh
+++ b/build/tools/extract_utils.sh
@@ -982,9 +982,9 @@ function extract() {
 
     for (( i=1; i<COUNT+1; i++ )); do
 
+        local SPEC_SRC_FILE=$(src_file "${FILELIST[$i-1]}")
         local SPEC_DST_FILE=$(target_file "${FILELIST[$i-1]}")
         local ARGS=$(target_args "${FILELIST[$i-1]}")
-        local FILE=$(src_file "${FILELIST[$i-1]}")
         local OUTPUT_DIR="$OUTPUT_ROOT"
         local TMP_DIR="$OUTPUT_TMP"
         local TARGET=
@@ -995,7 +995,7 @@ function extract() {
             TMP_DIR="$TMP_DIR/rootfs"
         else
             TARGET="system/${SPEC_DST_FILE}"
-            FILE="system/$FILE"
+            SPEC_SRC_FILE="system/${SPEC_SRC_FILE}"
         fi
 
         if [ "$SRC" = "adb" ]; then
@@ -1041,15 +1041,15 @@ function extract() {
             adb pull "/$TARGET" "$DEST"
             # if file does not exist try OEM target
             if [ "$?" != "0" ]; then
-                adb pull "/$FILE" "$DEST"
+                adb pull "/${SPEC_SRC_FILE}" "$DEST"
             fi
         else
             # Try Lineage target first
             if [ -f "$SRC/$TARGET" ]; then
                 cp "$SRC/$TARGET" "$DEST"
             # if file does not exist try OEM target
-            elif [ -f "$SRC/$FILE" ]; then
-                cp "$SRC/$FILE" "$DEST"
+            elif [ -f "$SRC/${SPEC_SRC_FILE}" ]; then
+                cp "$SRC/${SPEC_SRC_FILE}" "$DEST"
             else
                 printf '    !! file not found in source\n'
             fi
@@ -1058,11 +1058,11 @@ function extract() {
         if [ "$?" == "0" ]; then
             # Deodex apk|jar if that's the case
             if [[ "$FULLY_DEODEXED" -ne "1" && "$DEST" =~ .(apk|jar)$ ]]; then
-                oat2dex "$DEST" "$FILE" "$SRC"
+                oat2dex "$DEST" "${SPEC_SRC_FILE}" "$SRC"
                 if [ -f "$TMPDIR/classes.dex" ]; then
                     zip -gjq "$DEST" "$TMPDIR/classes.dex"
                     rm "$TMPDIR/classes.dex"
-                    printf '    (updated %s from odex files)\n' "/$FILE"
+                    printf '    (updated %s from odex files)\n' "/${SPEC_SRC_FILE}"
                 fi
             elif [[ "$DEST" =~ .xml$ ]]; then
                 fix_xml "$DEST"