StrixOS/vendor_strix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extract_utils: Fix regressions from 3f9b94cb67

Browse Source 
Change-Id: I78fc47c63e6bfbd5ee98a56a1d80f763e96ac266
This commit is contained in:
Paul Keith
2018-01-29 22:06:22 +01:00
committed by Michael Bestas
parent 3957e06d5a
commit 4e75f576f9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/tools/extract_utils.sh
View File

@@ -218,7 +218,7 @@ function write_product_copy_files() {
LINEEND="" LINEEND=""
fi fi
TARGET=$(target_file "$FILE") TARGET=$(echo $(target_file "$FILE") | sed 's/\;.*//')
if [ "$TREBLE_COMPAT" == "true" ] || [ "$TREBLE_COMPAT" == "1" ]; then if [ "$TREBLE_COMPAT" == "true" ] || [ "$TREBLE_COMPAT" == "1" ]; then
if prefix_match_file "vendor/" $TARGET ; then if prefix_match_file "vendor/" $TARGET ; then
local OUTTARGET=$(truncate_file $TARGET) local OUTTARGET=$(truncate_file $TARGET)
@@ -934,7 +934,7 @@ function extract() {
for (( i=1; i<COUNT+1; i++ )); do for (( i=1; i<COUNT+1; i++ )); do
local FROM=$(target_file "${FILELIST[$i-1]}") local FROM=$(echo $(target_file "${FILELIST[$i-1]}") | sed 's/\;.*//')
local ARGS=$(target_args "${FILELIST[$i-1]}") local ARGS=$(target_args "${FILELIST[$i-1]}")
local SPLIT=(${FILELIST[$i-1]//:/ }) local SPLIT=(${FILELIST[$i-1]//:/ })
local FILE=$(echo "${SPLIT[0]#-}" | sed 's/\;.*//') local FILE=$(echo "${SPLIT[0]#-}" | sed 's/\;.*//')