File tree 1 file changed +1
-22
lines changed
1 file changed +1
-22
lines changed Original file line number Diff line number Diff line change @@ -7,32 +7,11 @@ rm -rf $GAppsTmpFolder
7
7
rm -rf $GAppsExtractFolder
8
8
9
9
mkdir -p $GAppsOutputFolder
10
- mkdir -p $GAppsTmpFolder
11
- mkdir -p $GAppsExtractFolder
12
10
13
11
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'
30
13
31
14
echo " Post merge operation"
32
15
cp -ra $GAppsOutputFolder /product/* $GAppsRoot /product_output/
33
16
34
- echo " Deleting temporary files"
35
- rm -rf $GAppsTmpFolder
36
- rm -rf $GAppsExtractFolder
37
-
38
17
echo " !! GApps folder ready !!"
You can’t perform that action at this time.
0 commit comments