From 9b4ee564d65b66bdb245293812f1511bf2673663 Mon Sep 17 00:00:00 2001 From: Dan Church Date: Thu, 8 Dec 2022 14:21:45 -0600 Subject: [PATCH] Fix AdroitAdorKhan-EnergizedProtection Lock the repo to a commit right before things started breaking. --- .gitmodules | 6 +++--- lists/AdroitAdorKhan-core.hosts | 2 +- repos-noupdates/AdroitAdorKhan-EnergizedProtection | 1 + repos/AdroitAdorKhan-EnergizedProtection | 1 - update.sh | 5 ++++- 5 files changed, 9 insertions(+), 6 deletions(-) create mode 160000 repos-noupdates/AdroitAdorKhan-EnergizedProtection delete mode 160000 repos/AdroitAdorKhan-EnergizedProtection diff --git a/.gitmodules b/.gitmodules index cef4fb0..7246389 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,10 @@ -[submodule "repos/StevenBlack-hosts"] +[submodule "StevenBlack-hosts"] path = repos/StevenBlack-hosts url = https://github.com/StevenBlack/hosts.git branch = master shallow = true -[submodule "repos/AdroitAdorKhan-EnergizedProtection"] - path = repos/AdroitAdorKhan-EnergizedProtection +[submodule "AdroitAdorKhan-EnergizedProtection"] + path = repos-noupdates/AdroitAdorKhan-EnergizedProtection url = https://github.com/AdroitAdorKhan/EnergizedProtection.git branch = master shallow = true diff --git a/lists/AdroitAdorKhan-core.hosts b/lists/AdroitAdorKhan-core.hosts index b0346f9..ff35e9d 120000 --- a/lists/AdroitAdorKhan-core.hosts +++ b/lists/AdroitAdorKhan-core.hosts @@ -1 +1 @@ -../repos/AdroitAdorKhan-EnergizedProtection/core/hosts \ No newline at end of file +../repos-noupdates/AdroitAdorKhan-EnergizedProtection/core/hosts \ No newline at end of file diff --git a/repos-noupdates/AdroitAdorKhan-EnergizedProtection b/repos-noupdates/AdroitAdorKhan-EnergizedProtection new file mode 160000 index 0000000..d34e794 --- /dev/null +++ b/repos-noupdates/AdroitAdorKhan-EnergizedProtection @@ -0,0 +1 @@ +Subproject commit d34e794936f3bcd23b5df198c13b57f088041f9c diff --git a/repos/AdroitAdorKhan-EnergizedProtection b/repos/AdroitAdorKhan-EnergizedProtection deleted file mode 160000 index 112ded6..0000000 --- a/repos/AdroitAdorKhan-EnergizedProtection +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 112ded65a22583512bb814abaf9292122d713965 diff --git a/update.sh b/update.sh index 14d7a95..1c136b9 100755 --- a/update.sh +++ b/update.sh @@ -64,7 +64,10 @@ replace_with() { fi } -(cd "$WORKDIR" && git submodule update --init --remote) +(cd "$WORKDIR" && + git submodule update --init 'repos-noupdates/*' && + git submodule update --init --remote 'repos/*' +) for (( I = 0 ; I < ${#OUT[@]} ; ++I )); do MY_URL=${URL[$I]}