Skip to content

Commit 9e3211f

Browse files
author
LoveSy
authored
Update extract_gapps_pico.sh
1 parent 145465c commit 9e3211f

File tree

1 file changed

+1
-22
lines changed

1 file changed

+1
-22
lines changed

extract_gapps_pico.sh

+1-22
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,11 @@ rm -rf $GAppsTmpFolder
77
rm -rf $GAppsExtractFolder
88

99
mkdir -p $GAppsOutputFolder
10-
mkdir -p $GAppsTmpFolder
11-
mkdir -p $GAppsExtractFolder
1210

1311
echo "Unzipping OpenGApps"
14-
for file in "$GAppsRoot/"*.zip; do unzip -q "$file" -d $GAppsExtractFolder; done
15-
16-
echo "Extracting Core Google Apps"
17-
for f in "$GAppsExtractFolder/Core/"*.lz; do tar --lzip -xvf "$f" -C $GAppsTmpFolder &>/dev/null; done
18-
19-
echo "Extracting Google Apps"
20-
for f in "$GAppsExtractFolder/GApps/"*.lz; do tar --lzip -xvf "$f" -C $GAppsTmpFolder &>/dev/null; done
21-
22-
echo "Deleting duplicates & conflicting apps"
23-
rm -rf "$GAppsTmpFolder/setupwizardtablet-x86_64" # We already have setupwizard "default"
24-
25-
echo "Merging folders"
26-
for D in $GAppsTmpFolder/*; do [ -d "${D}" ] && cp -r ${D}/* $GAppsOutputFolder; done
27-
28-
echo "Merging subfolders"
29-
for D in $GAppsOutputFolder/*; do [ -d "${D}" ] && cp -r ${D}/* $GAppsOutputFolder && rm -rf ${D}; done
12+
find "$GAppsRoot/"*.zip -exec unzip -p {} {Core,GApps}/'*.lz' \; | tar --lzip -C $GAppsOutputFolder -xvf - -i --strip-components=2 --exclude='setupwizardtablet-x86_64'
3013

3114
echo "Post merge operation"
3215
cp -ra $GAppsOutputFolder/product/* $GAppsRoot/product_output/
3316

34-
echo "Deleting temporary files"
35-
rm -rf $GAppsTmpFolder
36-
rm -rf $GAppsExtractFolder
37-
3817
echo "!! GApps folder ready !!"

0 commit comments

Comments
 (0)