LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Don't use unzip -t when unzip -l will do." am: a803d77648

Browse Source 
Change-Id: Iff0917f55cf73803f2c381985ef445ce9f423bb7
This commit is contained in:
Treehugger Robot
2020-05-21 22:55:09 +00:00
committed by Automerger Merge Worker
parent db109eabff a803d77648
commit c26bc5cc4f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/tools/mk_sdk_repo_xml.sh
View File

@@ -383,13 +383,13 @@ while [[ -n "$1" ]]; do
if [[ $FIRST ]]; then if [[ $FIRST ]]; then
FIRST="" FIRST=""
if unzip -t "$SRC" | grep -qs "source.properties" ; then if unzip -l "$SRC" | grep -qs "source.properties" ; then
# Extract Source Properties # Extract Source Properties
# unzip: -j=flat (no dirs), -q=quiet, -o=overwrite, -d=dest dir # unzip: -j=flat (no dirs), -q=quiet, -o=overwrite, -d=dest dir
unzip -j -q -o -d "$TMP_DIR" "$SRC" "*/source.properties" unzip -j -q -o -d "$TMP_DIR" "$SRC" "*/source.properties"
PROPS="$TMP_DIR/source.properties" PROPS="$TMP_DIR/source.properties"
elif unzip -t "$SRC" | grep -qs "manifest.ini" ; then elif unzip -l "$SRC" | grep -qs "manifest.ini" ; then
unzip -j -q -o -d "$TMP_DIR" "$SRC" "*/manifest.ini" unzip -j -q -o -d "$TMP_DIR" "$SRC" "*/manifest.ini"
PROPS="$TMP_DIR/manifest.ini" PROPS="$TMP_DIR/manifest.ini"