From 2ac0a5cd1554404b91e270e9efcd70561e0959e0 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Sun, 3 Jun 2018 08:02:43 -0400
Subject: [PATCH] Add basic validation to init.sh

---
 Scripts/LineageOS-15.1/Patch.sh |  1 +
 Scripts/init.sh                 | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh
index e222786f..ea654154 100755
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -197,6 +197,7 @@ if [ "$MICROG_INCLUDED" = true ]; then echo "include vendor/lineage/config/sce-m
 cp -r $patches"android_vendor_lineage/firmware_deblobber" .;
 cp $patches"android_vendor_lineage/firmware_deblobber.mk" build/tasks/firmware_deblobber.mk;
 sed -i 's/LINEAGE_BUILDTYPE := UNOFFICIAL/LINEAGE_BUILDTYPE := dos/' config/common.mk; #Change buildtype
+if [ "$NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/LINEAGE_BUILDTYPE := dos/LINEAGE_BUILDTYPE := dosNC/' config/common.mk; fi;
 sed -i 's/messaging/Silence/' config/telephony.mk; #Replace AOSP Messaging app with Silence
 #if [ "$HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += DNS66" >> config/sce.mk; fi; #Include DNS66 as an alternative
 if [ "$HOSTS_BLOCKING" = false ]; then cp $patches"android_vendor_lineage/dns66.json" prebuilt/common/etc/dns66.json; fi;
diff --git a/Scripts/init.sh b/Scripts/init.sh
index 6aab9f94..95d7025c 100644
--- a/Scripts/init.sh
+++ b/Scripts/init.sh
@@ -31,11 +31,21 @@ export NON_COMMERCIAL_USE_PATCHES=false; #Switch to false to prevent inclusion o
 #END OF USER CONFIGURABLE OPTIONS
 
 BUILD_WORKING_DIR=${PWD##*/};
+if [ -d ".repo" ]; then
+	echo "Detected $BUILD_WORKING_DIR";
+else
+	echo "Not a valid workspace!";
+	return 1;
+fi;
 
 export SIGNING_KEY_DIR=$androidWorkspace"Signing_Keys";
 export OTA_PACKAGE_SIGNING_KEY=$SIGNING_KEY_DIR"/releasekey";
 
 export base=$androidWorkspace"Build/$BUILD_WORKING_DIR/";
+if [ ! -d $base ]; then
+	echo "Path mismatch! Please update init.sh!";
+	return 1;
+fi;
 
 export prebuiltApps=$androidWorkspace"PrebuiltApps/";
 export patches=$androidWorkspace"Patches/$BUILD_WORKING_DIR/";
@@ -45,6 +55,10 @@ export dosWallpapers=$androidWorkspace"Patches/Wallpapers/";
 
 export scriptsCommon=$androidWorkspace"Scripts/Common/";
 export scripts=$androidWorkspace"Scripts/$BUILD_WORKING_DIR/";
+if [ ! -d $scripts ]; then
+	echo "$BUILD_WORKING_DIR is not supported!";
+	return 1;
+fi;
 export cveScripts=$scripts"CVE_Patchers/";
 
 export ANDROID_HOME="/home/$USER/Android/Sdk";