From 1556219a435122876c860f002e31583f59b92c5c Mon Sep 17 00:00:00 2001 From: SoundDrill31 <84176052+sounddrill31@users.noreply.github.com> Date: Tue, 6 Aug 2024 17:54:17 +0530 Subject: [PATCH] Crave: Do not modify repo if it is running on Devspace CLI Crave Devspace CLI already provides a system for cloning ROMs, and the repo tool we use is a shim which tells users not to do this. People starting off using convenience tools like this sometimes don't read the community written documentation properly and tend to unknowingly circumvent the rules --- setup/android_build_env.sh | 8 ++++++-- setup/clear.sh | 8 ++++++-- setup/fedora.sh | 8 ++++++-- setup/opensuse.sh | 8 ++++++-- setup/solus.sh | 8 ++++++-- 5 files changed, 30 insertions(+), 10 deletions(-) diff --git a/setup/android_build_env.sh b/setup/android_build_env.sh index f6f9fe57..059f3131 100755 --- a/setup/android_build_env.sh +++ b/setup/android_build_env.sh @@ -67,5 +67,9 @@ if [[ "$(command -v make)" ]]; then fi echo "Installing repo" -sudo curl --create-dirs -L -o /usr/local/bin/repo -O -L https://storage.googleapis.com/git-repo-downloads/repo -sudo chmod a+rx /usr/local/bin/repo +if [ "${DCDEVSPACE}" == "1" ]; then + echo "Modifying Repo on Crave Devspace CLI is not allowed!" +else + sudo curl --create-dirs -L -o /usr/local/bin/repo -O -L https://storage.googleapis.com/git-repo-downloads/repo + sudo chmod a+rx /usr/local/bin/repo +fi \ No newline at end of file diff --git a/setup/clear.sh b/setup/clear.sh index bf4f70d4..6a4719c2 100755 --- a/setup/clear.sh +++ b/setup/clear.sh @@ -18,8 +18,12 @@ sudo udevadm control --reload-rules # REPO echo "Setting up Repo..." -sudo curl --create-dirs -L -o /usr/local/bin/repo -O -L https://storage.googleapis.com/git-repo-downloads/repo -sudo chmod a+rx /usr/local/bin/repo +if [ "${DCDEVSPACE}" == "1" ]; then + echo "Modifying Repo on Crave Devspace CLI is not allowed!" +else + sudo curl --create-dirs -L -o /usr/local/bin/repo -O -L https://storage.googleapis.com/git-repo-downloads/repo + sudo chmod a+rx /usr/local/bin/repo +fi echo "You're now ready to start contributing to AOSP!" diff --git a/setup/fedora.sh b/setup/fedora.sh index f50d47ec..c02104f6 100755 --- a/setup/fedora.sh +++ b/setup/fedora.sh @@ -59,8 +59,12 @@ sudo ln -s /usr/lib64/libncurses.so.6 /usr/lib64/libtinfo.so.5 # Repo echo "Installing Git Repository Tool" -sudo curl --create-dirs -L -o /usr/local/bin/repo -O -L https://storage.googleapis.com/git-repo-downloads/repo -sudo chmod a+rx /usr/local/bin/repo +if [ "${DCDEVSPACE}" == "1" ]; then + echo "Modifying Repo on Crave Devspace CLI is not allowed!" +else + sudo curl --create-dirs -L -o /usr/local/bin/repo -O -L https://storage.googleapis.com/git-repo-downloads/repo + sudo chmod a+rx /usr/local/bin/repo +fi echo -e "Setting up udev rules for ADB!" sudo curl --create-dirs -L -o /etc/udev/rules.d/51-android.rules -O -L https://raw.githubusercontent.com/M0Rf30/android-udev-rules/master/51-android.rules diff --git a/setup/opensuse.sh b/setup/opensuse.sh index f3c8480e..71008120 100644 --- a/setup/opensuse.sh +++ b/setup/opensuse.sh @@ -81,8 +81,12 @@ sudo ln -s /usr/lib64/libncurses.so.6 /usr/lib64/libtinfo.so.5 # Repo echo "Installing Git Repository Tool" -sudo curl --create-dirs -L -o /usr/local/bin/repo -O -L https://storage.googleapis.com/git-repo-downloads/repo -sudo chmod a+rx /usr/local/bin/repo +if [ "${DCDEVSPACE}" == "1" ]; then + echo "Modifying Repo on Crave Devspace CLI is not allowed!" +else + sudo curl --create-dirs -L -o /usr/local/bin/repo -O -L https://storage.googleapis.com/git-repo-downloads/repo + sudo chmod a+rx /usr/local/bin/repo +fi echo -e "Setting up udev rules for ADB!" sudo curl --create-dirs -L -o /etc/udev/rules.d/51-android.rules -O -L https://raw.githubusercontent.com/M0Rf30/android-udev-rules/master/51-android.rules diff --git a/setup/solus.sh b/setup/solus.sh index fda221e3..23912f50 100755 --- a/setup/solus.sh +++ b/setup/solus.sh @@ -21,7 +21,11 @@ sudo chown root /etc/udev/rules.d/51-android.rules sudo usysconf run -f echo "Installing repo" -sudo curl --create-dirs -L -o /usr/local/bin/repo -O -L https://storage.googleapis.com/git-repo-downloads/repo -sudo chmod a+x /usr/local/bin/repo +if [ "${DCDEVSPACE}" == "1" ]; then + echo "Modifying Repo on Crave Devspace CLI is not allowed!" +else + sudo curl --create-dirs -L -o /usr/local/bin/repo -O -L https://storage.googleapis.com/git-repo-downloads/repo + sudo chmod a+x /usr/local/bin/repo +fi echo "You are now ready to build Android!"