From 559a794b496f8bfac022ec029c98520f8be7fde2 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@gmail.com>
Date: Wed, 13 Jul 2022 00:13:36 +0300
Subject: [PATCH] aosp-merger: s/LineageOS//

No need to brand simple console logs

Change-Id: Id2224ecc4b414919212328b2b25f0a7e3ccd4c6e
---
 aosp-merger/README.md           | 2 +-
 aosp-merger/merge-aosp-forks.sh | 4 ++--
 aosp-merger/push-merge.sh       | 2 +-
 aosp-merger/squash.sh           | 2 +-
 aosp-merger/upload-squash.sh    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/aosp-merger/README.md b/aosp-merger/README.md
index 7d9935d..a582acc 100644
--- a/aosp-merger/README.md
+++ b/aosp-merger/README.md
@@ -15,7 +15,7 @@
 
 4. Every project in your tree should now be one of:
    * \<newaosptag> if the project was tracking AOSP
-   * a staging branch if the project was a LineageOS fork from AOSP (check `merged_repos.txt` for status and whether there are conflicts to resolve)
+   * a staging branch if the project was a fork from AOSP (check `merged_repos.txt` for status and whether there are conflicts to resolve)
    * the default repo lineage branch for `.repo/manifests/snippets.xml` projects
 5. Restore your local branches and merge in the staging branch:
 
diff --git a/aosp-merger/merge-aosp-forks.sh b/aosp-merger/merge-aosp-forks.sh
index 3b84448..2307f65 100755
--- a/aosp-merger/merge-aosp-forks.sh
+++ b/aosp-merger/merge-aosp-forks.sh
@@ -59,13 +59,13 @@ STAGINGBRANCH="staging/${BRANCHSUFFIX}"
 # Source build environment (needed for aospremote)
 source "${TOP}/build/envsetup.sh"
 
-# Build list of LineageOS forked repos
+# Build list of forked repos
 PROJECTPATHS=$(grep "name=\"LineageOS/" "${MANIFEST}" | sed -n 's/.*path="\([^"]\+\)".*/\1/p')
 
 echo "#### Old tag = ${OLDTAG} Branch = ${BRANCH} Staging branch = ${STAGINGBRANCH} ####"
 
 # Make sure manifest and forked repos are in a consistent state
-echo "#### Verifying there are no uncommitted changes on LineageOS forked AOSP projects ####"
+echo "#### Verifying there are no uncommitted changes on forked AOSP projects ####"
 for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do
     cd "${TOP}/${PROJECTPATH}"
     aospremote | grep -v "Remote 'aosp' created"
diff --git a/aosp-merger/push-merge.sh b/aosp-merger/push-merge.sh
index 6531db6..ac77ee7 100755
--- a/aosp-merger/push-merge.sh
+++ b/aosp-merger/push-merge.sh
@@ -51,7 +51,7 @@ PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}')
 echo "#### Branch = ${BRANCH} Staging branch = ${STAGINGBRANCH} ####"
 
 # Make sure manifest and forked repos are in a consistent state
-echo "#### Verifying there are no uncommitted changes on LineageOS forked AOSP projects ####"
+echo "#### Verifying there are no uncommitted changes on forked AOSP projects ####"
 for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do
     cd "${TOP}/${PROJECTPATH}"
     if [[ -n "$(git status --porcelain)" ]]; then
diff --git a/aosp-merger/squash.sh b/aosp-merger/squash.sh
index e538905..fb83a42 100755
--- a/aosp-merger/squash.sh
+++ b/aosp-merger/squash.sh
@@ -57,7 +57,7 @@ PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}')
 echo "#### Branch = ${BRANCH} Squash branch = ${SQUASHBRANCH} ####"
 
 # Make sure manifest and forked repos are in a consistent state
-echo "#### Verifying there are no uncommitted changes on LineageOS forked AOSP projects ####"
+echo "#### Verifying there are no uncommitted changes on forked AOSP projects ####"
 for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do
     cd "${TOP}/${PROJECTPATH}"
     if [[ -n "$(git status --porcelain)" ]]; then
diff --git a/aosp-merger/upload-squash.sh b/aosp-merger/upload-squash.sh
index 8a50863..588d783 100755
--- a/aosp-merger/upload-squash.sh
+++ b/aosp-merger/upload-squash.sh
@@ -59,7 +59,7 @@ PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}')
 echo "#### Squash branch = ${SQUASHBRANCH} ####"
 
 # Make sure manifest and forked repos are in a consistent state
-echo "#### Verifying there are no uncommitted changes on LineageOS forked AOSP projects ####"
+echo "#### Verifying there are no uncommitted changes on forked AOSP projects ####"
 for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do
     cd "${TOP}/${PROJECTPATH}"
     if [[ -n "$(git status --porcelain)" ]]; then