Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a1e69a4 authored by Sam Lewis's avatar Sam Lewis Committed by Automerger Merge Worker
Browse files

Merge "Remove prompt to repair Cog workspace" into main am: 9964b7ee 

Original change: https://android-review.googlesource.com/c/platform/build/+/3280251



Change-Id: Ie0e8b27804e6170bb45c3490cd853e37f37bb095
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4427c387 9964b7ee

shell_utils.sh

+4 −9
Original line number Diff line number Diff line
@@ -109,16 +109,11 @@ function setup_cog_symlink() { 


  local link_destination="${HOME}/.cog/android-build-out"



  # if there's a local out/ dir, prompt the user to remove it.

  # fail out if they say no.

  local answer

  # remove existing out/ dir if it exists

  if [[ -d "$out_dir" ]]; then

    echo "Detected existing out/ directory in the Cog workspace which is not supported. Can we repair your workspace by removing it and creating the symlink to ~/.cog/android-build-out instead? (y/N): "

    read -r answer

    if [[ $answer =~ ^[Yy]$ ]]; then

      rm -rf "$out_dir"

    else

      echo "Exiting due to unsupported out/ directory."

    echo "Detected existing out/ directory in the Cog workspace which is not supported. Repairing workspace by removing it and creating the symlink to ~/.cog/android-build-out"

    if ! rm -rf "$out_dir"; then

      echo "Failed to remove existing out/ directory: $out_dir" >&2

      kill -INT $$ # exits the script without exiting the user's shell

    fi

  fi