commit 411e0695f29ff713f2c1ec1c01f03857a90006b0
author Vladimir Oltean <olteanv@gmail.com> Sun Jun 24 20:38:04 2018 +0300
committer Michael Bestas <mkbestas@lineageos.org> Sun Jul 08 20:14:12 2018 +0200
tree 48da31bea484ebe27f0c632461762af16cad2314
parent 95643284179272619c779d1906151bdfef2c1801

extract_utils: extract(): rename FROM variable to SPEC_DST_FILE

* This is a cleanup patch.

Change-Id: I308b0478484ccf9a594078825731606fce5f5507
Signed-off-by: Vladimir Oltean <olteanv@gmail.com>

build/tools/extract_utils.sh

diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh
index bbe8579..e6be42b 100644
--- a/build/tools/extract_utils.sh
+++ b/build/tools/extract_utils.sh
@@ -982,7 +982,7 @@
 
     for (( i=1; i<COUNT+1; i++ )); do
 
-        local FROM=$(target_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"
@@ -990,11 +990,11 @@
         local TARGET=
 
         if [ "$ARGS" = "rootfs" ]; then
-            TARGET="$FROM"
+            TARGET="${SPEC_DST_FILE}"
             OUTPUT_DIR="$OUTPUT_DIR/rootfs"
             TMP_DIR="$TMP_DIR/rootfs"
         else
-            TARGET="system/$FROM"
+            TARGET="system/${SPEC_DST_FILE}"
             FILE="system/$FILE"
         fi
 
@@ -1004,11 +1004,11 @@
             printf '  - %s \n' "/$TARGET"
         fi
 
-        local DIR=$(dirname "$FROM")
+        local DIR=$(dirname "${SPEC_DST_FILE}")
         if [ ! -d "$OUTPUT_DIR/$DIR" ]; then
             mkdir -p "$OUTPUT_DIR/$DIR"
         fi
-        local DEST="$OUTPUT_DIR/$FROM"
+        local DEST="$OUTPUT_DIR/${SPEC_DST_FILE}"
 
         # Check pinned files
         local HASH="${HASHLIST[$i-1]}"
@@ -1017,7 +1017,7 @@
             if [ -f "$DEST" ]; then
                 local PINNED="$DEST"
             else
-                local PINNED="$TMP_DIR/$FROM"
+                local PINNED="$TMP_DIR/${SPEC_DST_FILE}"
             fi
             if [ -f "$PINNED" ]; then
                 if [ "$(uname)" == "Darwin" ]; then