commit 305db7cc755a3cc53b5b24acea3c2a92543702df
author Jackeagle <jackeagle102@gmail.com> Thu Jan 23 10:35:22 2020 +0100
committer Jackeagle <jackeagle102@gmail.com> Wed Oct 07 04:19:05 2020 -0400
tree 86e63f88138de79f37db404b4cff202c7ac74c4b
parent 191ece71f7a7eef5b5919ee7d812f2b27e30804a

envsetup: Add blissify function

- Remove brunch option
- Migrate all lineage gerrit vars to bliss

Change-Id: I209f19c573a17a7844bdfb1e46ed82b3ff292d0b
Signed-off-by: Jackeagle <jackeagle102@gmail.com>

build/envsetup.sh

diff --git a/build/envsetup.sh b/build/envsetup.sh
index 9697648..dc0fba0 100644
--- a/build/envsetup.sh
+++ b/build/envsetup.sh
@@ -20,6 +20,8 @@
 - repopick:        Utility to fetch changes from Gerrit.
 - installboot:     Installs a boot.img to the connected device.
 - installrecovery: Installs a recovery.img to the connected device.
+- blissify:        Sets up build environment using breakfast(),
+                   and then compiles using mka() against blissify target.
 EOF
 }
 
@@ -52,18 +54,6 @@
     return $ret
 }
 
-function brunch()
-{
-    breakfast $*
-    if [ $? -eq 0 ]; then
-        mka bacon
-    else
-        echo "No such item in brunch menu. Try 'breakfast'"
-        return 1
-    fi
-    return $?
-}
-
 function breakfast()
 {
     target=$1
@@ -119,7 +109,7 @@
 
 function omnom()
 {
-    brunch $*
+    blissify $*
     eat
 }
 
@@ -241,32 +231,32 @@
     fi
     git remote rm bliss 2> /dev/null
     local REMOTE=$(git config --get remote.github.projectname)
-    local LINEAGE="true"
+    local BLISS="true"
     if [ -z "$REMOTE" ]
     then
         REMOTE=$(git config --get remote.aosp.projectname)
-        LINEAGE="false"
+        BLISS="false"
     fi
     if [ -z "$REMOTE" ]
     then
         REMOTE=$(git config --get remote.caf.projectname)
-        LINEAGE="false"
+        BLISS="false"
     fi
 
-    if [ $LINEAGE = "false" ]
+    if [ $BLISS = "false" ]
     then
         local PROJECT=$(echo $REMOTE | sed -e "s#platform/#android/#g; s#/#_#g")
-        local PFX="LineageOS/"
+        local PFX="BLISS/"
     else
         local PROJECT=$REMOTE
     fi
 
-    local LINEAGE_USER=$(git config --get review.review.blissroms.com.username)
-    if [ -z "$LINEAGE_USER" ]
+    local BLISS_USER=$(git config --get review.review.blissroms.com.username)
+    if [ -z "$BLISS_USER" ]
     then
         git remote add bliss ssh://review.blissroms.com:29418/$PFX$PROJECT
     else
-        git remote add bliss ssh://$LINEAGE_USER@review.blissroms.com:29418/$PFX$PROJECT
+        git remote add bliss ssh://$BLISS_USER@review.blissroms.com:29418/$PFX$PROJECT
     fi
     echo "Remote 'bliss' created"
 }
@@ -928,7 +918,7 @@
     common_out_dir=$(get_build_var OUT_DIR)/target/common
     target_device=$(get_build_var TARGET_DEVICE)
     common_target_out=common-${target_device}
-    if [ ! -z $LINEAGE_FIXUP_COMMON_OUT ]; then
+    if [ ! -z $BLISS_FIXUP_COMMON_OUT ]; then
         if [ -d ${common_out_dir} ] && [ ! -L ${common_out_dir} ]; then
             mv ${common_out_dir} ${common_out_dir}-${target_device}
             ln -s ${common_target_out} ${common_out_dir}
@@ -942,3 +932,15 @@
         mkdir -p ${common_out_dir}
     fi
 }
+
+function blissify()
+{
+    breakfast $*
+    if [ $? -eq 0 ]; then
+        mka blissify
+    else
+        echo "No such item in brunch menu. Try 'breakfast'"
+        return 1
+    fi
+    return $?
+}