diff --git a/build/gapps.sh b/build/gapps.sh old mode 100644 new mode 100755 index 584bac7..e5caf34 --- a/build/gapps.sh +++ b/build/gapps.sh @@ -18,27 +18,27 @@ GLOG=/tmp/gapps_log ## # functions # -function printerr(){ +function printerr() { echo "$(tput setaf 1)$1$(tput sgr 0)" } -function printdone(){ +function printdone() { echo "$(tput setaf 2)$1$(tput sgr 0)" } -function clean(){ +function clean() { echo "Cleaning up..." rm -r $OUT/$GARCH rm /tmp/$BUILDZIP return $? } -function Gfailed(){ +function Gfailed() { printerr "Build failed, check $GLOG" exit 1 } -function create(){ +function create() { test -f $GLOG && rm -f $GLOG echo "Starting GApps compilation" > $GLOG echo "ARCH= $GARCH" >> $GLOG @@ -55,7 +55,7 @@ function create(){ cp -r $COMMON $OUT/$GARCH >> $GLOG } -function zipit(){ +function zipit() { BUILDZIP=gapps-$ANDROIDV-$GARCH-$DATE.zip echo "Importing installation scripts..." cp -r $METAINF $OUT/$GARCH/META-INF && echo "Meta copied" >> $GLOG @@ -74,7 +74,7 @@ function zipit(){ fi } -function getmd5(){ +function getmd5() { if [ -x $(which md5sum) ]; then echo "md5sum is installed, getting md5..." >> $GLOG echo "Getting md5sum..." diff --git a/build/main.mk b/build/main.mk index c9cf245..598f3b0 100644 --- a/build/main.mk +++ b/build/main.mk @@ -5,18 +5,18 @@ BUILD_GAPPS := $(BUILD_SYSTEM)/gapps.sh OUTDIR := $(TOPDIR)/out LOG_BUILD := /tmp/gapps_log -distclean : +distclean: @rm -fr $(OUTDIR) - @echo "$(tput setaf 2)Output removed! Ready for a clean build$(tput sgr 0)" + @echo "Output removed! Ready for a clean build" -arm : +gapps_arm: @echo "Compiling GApps for arm..." @bash $(BUILD_GAPPS) arm 2>&1 -arm64 : +gapps_arm64: @echo "Compiling GApps for arm64..." @bash $(BUILD_GAPPS) arm64 2>&1 -x86 : +gapps_x86: @echo "Compiling GApps for x86..." @bash $(BUILD_GAPPS) x86 2>&1