From 07ab51b2621203fc50a824b3d34befcff79e31c9 Mon Sep 17 00:00:00 2001 From: peterdavidfagan Date: Fri, 19 Apr 2024 19:36:46 +0100 Subject: [PATCH 1/2] remove remote submodule update --- scripts/setup/laptop_setup.sh | 2 +- scripts/setup/nuc_setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/setup/laptop_setup.sh b/scripts/setup/laptop_setup.sh index 2924106..fffa82a 100755 --- a/scripts/setup/laptop_setup.sh +++ b/scripts/setup/laptop_setup.sh @@ -38,7 +38,7 @@ if [ "$first_time" = "yes" ]; then curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash apt update && apt install -y git-lfs git lfs install # has to be run only once on a single user account - cd $ROOT_DIR && git submodule update --recursive --remote --init + cd $ROOT_DIR && git submodule update --recursive --init # install docker echo -e "Install docker \n" diff --git a/scripts/setup/nuc_setup.sh b/scripts/setup/nuc_setup.sh index bd8679e..98d1af7 100755 --- a/scripts/setup/nuc_setup.sh +++ b/scripts/setup/nuc_setup.sh @@ -18,7 +18,7 @@ if [ "$first_time" = "yes" ]; then eval "$(ssh-agent -s)" ssh-add /home/$USERNAME/.ssh/id_ed25519 ROOT_DIR="$(git rev-parse --show-toplevel)" - cd $ROOT_DIR && git submodule update --recursive --remote --init + cd $ROOT_DIR && git submodule update --recursive --init # install docker echo -e "\nInstall docker \n" From cfbf00d20e7bb7021bb6f78e3480a3376c55ef0c Mon Sep 17 00:00:00 2001 From: peterdavidfagan Date: Fri, 19 Apr 2024 19:41:24 +0100 Subject: [PATCH 2/2] remove submodules that don't require building --- scripts/setup/laptop_setup.sh | 2 +- scripts/setup/nuc_setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/setup/laptop_setup.sh b/scripts/setup/laptop_setup.sh index fffa82a..64c086b 100755 --- a/scripts/setup/laptop_setup.sh +++ b/scripts/setup/laptop_setup.sh @@ -38,7 +38,7 @@ if [ "$first_time" = "yes" ]; then curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash apt update && apt install -y git-lfs git lfs install # has to be run only once on a single user account - cd $ROOT_DIR && git submodule update --recursive --init + cd $ROOT_DIR && git rm ./src/droid/fairo && git submodule update --recursive --init # install docker echo -e "Install docker \n" diff --git a/scripts/setup/nuc_setup.sh b/scripts/setup/nuc_setup.sh index 98d1af7..1e88b7e 100755 --- a/scripts/setup/nuc_setup.sh +++ b/scripts/setup/nuc_setup.sh @@ -18,7 +18,7 @@ if [ "$first_time" = "yes" ]; then eval "$(ssh-agent -s)" ssh-add /home/$USERNAME/.ssh/id_ed25519 ROOT_DIR="$(git rev-parse --show-toplevel)" - cd $ROOT_DIR && git submodule update --recursive --init + cd $ROOT_DIR && git rm ./src/droid/oculus_reader && git submodule update --recursive --init # install docker echo -e "\nInstall docker \n"