From 3376142301d44052fe6cc7b7d6abcfbfa3f4bc53 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Sun, 29 Oct 2017 02:43:38 -0400
Subject: [PATCH] Fixes

---
 Scripts/LineageOS-14.1/Patch.sh     | 12 +++++++-----
 Scripts/LineageOS-14.1/Patch_CVE.sh |  6 +++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index aa471154..20d05d4f 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 #Copyright (c) 2015-2017 Spot Communications, Inc.
 
-#Delete Everything
-#repo forall -c 'git add -A && git reset --hard' && rm -rf packages/apps/{FDroid,GmsCore,Silence} out
+#Delete Everything and Sync
+#repo forall -c 'git add -A && git reset --hard' && rm -rf packages/apps/{FDroid,GmsCore,Silence} out && repo sync -j20 --force-sync
 
 #Initialize some variables
 #source ../../Scripts/LineageOS-14.1/00init.sh
 
-#Prepare a build
-#repo sync -j20 --force-sync && source $scripts/Patch.sh && source $scripts/Optimize.sh && source $scripts/Rebrand.sh && source $scripts/Theme.sh && source $scripts/Generic_Deblob.sh && source $scripts/Patch_CVE.sh && source build/envsetup.sh && export ANDROID_HOME="/home/$USER/Android/Sdk" && export ANDROID_JACK_VM_ARGS="-Xmx6144m -Xms512m -Dfile.encoding=UTF-8 -XX:+TieredCompilation" && export JACK_SERVER_VM_ARGUMENTS="${ANDROID_JACK_VM_ARGS}" && GRADLE_OPTS=-Xmx2048m && export KBUILD_BUILD_USER=emy && export KBUILD_BUILD_HOST=dosbm
+#Apply all of our changes
+#source $scripts/Patch.sh && source $scripts/Optimize.sh && source $scripts/Rebrand.sh && source $scripts/Theme.sh && source $scripts/Deblob.sh && source $scripts/Patch_CVE.sh && source build/envsetup.sh && export ANDROID_HOME="/home/$USER/Android/Sdk" && export ANDROID_JACK_VM_ARGS="-Xmx6144m -Xms512m -Dfile.encoding=UTF-8 -XX:+TieredCompilation" && export JACK_SERVER_VM_ARGUMENTS="${ANDROID_JACK_VM_ARGS}" && GRADLE_OPTS=-Xmx2048m && export KBUILD_BUILD_USER=emy && export KBUILD_BUILD_HOST=dosbm
 
 #Build!
 #brunch lineage_mako-user && export OTA_PACKAGE_SIGNING_KEY=../../Signing_Keys/releasekey && export SIGNING_KEY_DIR=../../Signing_Keys && brunch lineage_clark-user && brunch lineage_bacon-user && brunch lineage_thor-userdebug && brunch lineage_angler-user && brunch lineage_bullhead-user && brunch lineage_ether-user && brunch lineage_flounder-user && brunch lineage_flo-user && brunch lineage_FP2-user && brunch lineage_hammerhead-user && brunch lineage_marlin-user && brunch lineage_sailfish-user && brunch lineage_n5110-user && brunch lineage_osprey-user && brunch lineage_shamu-user && brunch lineage_Z00T-user
@@ -242,7 +242,9 @@ enter "kernel/motorola/msm8916"
 patch -p1 < $patches"android_kernel_motorola_msm8916/0001-Overclock.patch" #1.36Ghz -> 1.88Ghz	=+ 2.07Ghz
 
 #Enhance and improve security of GPS for all devices
-find $base"device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enhanceLocation "$0"' {} \;
+cd $base
+find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enhanceLocation "$0"' {} \;
+cd $base
 #
 #END OF DEVICE CHANGES
 #
diff --git a/Scripts/LineageOS-14.1/Patch_CVE.sh b/Scripts/LineageOS-14.1/Patch_CVE.sh
index fb915bec..c9f0baf1 100644
--- a/Scripts/LineageOS-14.1/Patch_CVE.sh
+++ b/Scripts/LineageOS-14.1/Patch_CVE.sh
@@ -5,7 +5,11 @@
 
 echo "Patching CVEs..."
 
-source $cveScripts"*.sh";
+cd $base
+for patcher in $cveScripts/*.sh; do
+	echo "Running " $patcher;
+	source $patcher;
+done;
 
 cd $base
 echo "Patched CVEs!"