From 5a75fb491d41c96125f99ff6bcf0553647b04589 Mon Sep 17 00:00:00 2001 From: Sommerwiesel Date: Wed, 18 Jun 2025 16:23:05 +0200 Subject: [PATCH] Rewrite into submodule repo --- .gitignore | 1 - .gitmodules | 6 ++++++ README.md | 16 +++++++--------- build | 1 + companion | 1 + 5 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 .gitmodules create mode 160000 build create mode 160000 companion diff --git a/.gitignore b/.gitignore index 567609b..e69de29 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +0,0 @@ -build/ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..c22841c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "build"] + path = build + url = https://github.com/iv-org/invidious +[submodule "companion"] + path = companion + url = https://github.com/iv-org/invidious-companion diff --git a/README.md b/README.md index 7ee4bd1..96daccf 100644 --- a/README.md +++ b/README.md @@ -26,18 +26,16 @@ You'll have to set these up yourself: Do this in a separate dir (for example /srv/invidious) under non-root permissions -1. `git clone https://github.com/Sommerwiesel/invidious-nerdvpn .` -2. `git clone https://github.com/iv-org/invidious build` -3. `git clone https://github.com/iv-org/invidious-companion companion` -4. Modify the patches under invidious-nerdvpn/patches to your needs (i.e. change branding) and then run `./patch.sh` -5. `./build.sh development` for the development image or `./build.sh release` for the production image -6. `build.sh companion` to build the invidious companion +1. `git clone --recurse-submodules https://github.com/Sommerwiesel/invidious-nerdvpn .` +2. Modify the patches under invidious-nerdvpn/patches to your needs (i.e. change branding) and then run `./patch.sh` +3. `./build.sh development` for the development image or `./build.sh release` for the production image +4. `build.sh companion` to build the invidious companion # Update instructions -1. Run `./revert.sh` to remove all patches -2. Update both repos (build and companion) via `git pull` -3. Run the steps 5 and 6 again from the run instructions +1. `./revert.sh` to remove all patch-modifications +2. `git pull --recurse-submodules` +3. Run the steps 3 and 4 again from the run instructions # Run instructions (docker compose) diff --git a/build b/build new file mode 160000 index 0000000..df8839d --- /dev/null +++ b/build @@ -0,0 +1 @@ +Subproject commit df8839d1f018644afecb15e144f228d811708f8f diff --git a/companion b/companion new file mode 160000 index 0000000..e6c9c5c --- /dev/null +++ b/companion @@ -0,0 +1 @@ +Subproject commit e6c9c5cb6efe2731163b59ab59c72cd07462a6f3