From 636005439ce2b0a36b13882906b09b3ec8e2c699 Mon Sep 17 00:00:00 2001
From: Robin Vobruba <hoijui.quaero@gmail.com>
Date: Mon, 3 Jun 2024 12:38:50 +0100
Subject: [PATCH] Removes sub-module 'scripts'

---
 .github/workflows/build.yml   | 21 ++++++++++++++------
 .github/workflows/release.yml | 36 +++++++++++++++++++++++++++--------
 .gitmodules                   |  3 ---
 scripts                       |  1 -
 4 files changed, 43 insertions(+), 18 deletions(-)
 delete mode 160000 scripts

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 69da3d4..f4ba07f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ on:
       - '**/Cargo.toml'
       - 'Cargo.lock'
       - '**/Cargo.lock'
-      - 'scripts/build'
+      - 'run/rp/build'
       - '.github/workflows/build.yml'
   release:
     types: [ published ]
@@ -38,8 +38,18 @@ jobs:
           fetch-depth: 0
           submodules: true
 
+      - name: "Check out the build scripts"
+        uses: actions/checkout@v4
+        with:
+          repository: 'hoijui/rust-project-scripts'
+          path: 'run/rp'
+          submodules: true
+
+      - name: "Mark the build scripts as Git-ignored, locally"
+        run: if ! grep -q -r "^/run/rp/\$" .git/info/exclude; then echo '/run/rp/' >> .git/info/exclude; fi
+
       - name: "Install STOML (BASH TOML parser)"
-        run: scripts/install_stoml
+        run: run/rp/install_stoml
 
       - name: "Setup Python 3"
         uses: actions/setup-python@v4
@@ -61,11 +71,10 @@ jobs:
         uses: Swatinem/rust-cache@v2
 
       - name: "Install STOML (BASH TOML parser) *again*, because the cache recreation above might have removed it"
-        run: scripts/install_stoml
+        run: run/rp/install_stoml
 
       - name: "Build"
-        run: scripts/build
+        run: run/rp/build
 
       - name: "Test & Check"
-        run: scripts/test
-
+        run: run/rp/test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 222b3a1..08853f4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -47,13 +47,23 @@ jobs:
           fetch-depth: 0
           submodules: true
 
+      - name: "Check out the build scripts"
+        uses: actions/checkout@v4
+        with:
+          repository: 'hoijui/rust-project-scripts'
+          path: 'run/rp'
+          submodules: true
+
+      - name: "Mark the build scripts as Git-ignored, locally"
+        run: if ! grep -q -r "^/run/rp/\$" .git/info/exclude; then echo '/run/rp/' >> .git/info/exclude; fi
+
       - name: "Install STOML (BASH TOML parser)"
-        run: scripts/install_stoml
+        run: run/rp/install_stoml
 
       - name: Set the environment variables (including OUR_VERSION)
         shell: bash
         if: env.OUR_VERSION == ''
-        run: scripts/env
+        run: run/rp/env
 
       - name: Create GitHub release
         id: release
@@ -109,19 +119,29 @@ jobs:
         fetch-depth: 0
         submodules: true
 
+    - name: "Check out the build scripts"
+      uses: actions/checkout@v4
+      with:
+        repository: 'hoijui/rust-project-scripts'
+        path: 'run/rp'
+        submodules: true
+
+    - name: "Mark the build scripts as Git-ignored, locally"
+      run: if ! grep -q -r "^/run/rp/\$" .git/info/exclude; then echo '/run/rp/' >> .git/info/exclude; fi
+
     - name: "Install STOML (BASH TOML parser)"
       run: |
-        scripts/install_stoml
+        run/rp/install_stoml
 
     - name: Set the environment variables (including OUR_VERSION)
       shell: bash
       if: env.OUR_VERSION == ''
-      run: scripts/env
+      run: run/rp/env
 
     - name: Install packages (Ubuntu)
       if: matrix.os == 'ubuntu-latest'
       run: |
-        scripts/install_deps_ubuntu
+        run/rp/install_deps_ubuntu
 
     # - name: Install packages (macOS)
     #   if: matrix.os == 'macos-latest'
@@ -149,7 +169,7 @@ jobs:
         echo "target dir is: ${{ env.TARGET_DIR }}"
 
     - name: Build and strip release binary
-      run: scripts/build --skip-strip
+      run: run/rp/build --skip-strip
 
     # - name: Strip release binary (linux and macos)
     #   if: matrix.build == 'linux' || matrix.build == 'macos'
@@ -169,7 +189,7 @@ jobs:
       run: |
         export ENV_FILE="proj_build_envs.txt"
         # This writes "BINARY=bla" to ENV_FILE
-        scripts/env
+        run/rp/env
         source "$ENV_FILE"
         BIN="target/release/$BINARY"
         if [ -f "$BIN" ]
@@ -195,7 +215,7 @@ jobs:
     - name: Build archive
       shell: bash
       run: |
-        scripts/package
+        run/rp/package
 
     - name: Upload release archive
       uses: actions/upload-release-asset@v1.0.1
diff --git a/.gitmodules b/.gitmodules
index 9721bef..3f2d60c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,9 +2,6 @@
 #
 # SPDX-License-Identifier: Unlicense
 
-[submodule "scripts"]
-	path = scripts
-	url = https://github.com/hoijui/rust-project-scripts.git
 [submodule "resources/osh-dir-std"]
 	path = lib/resources/osh-dir-std
 	url = https://github.com/hoijui/osh-dir-std.git
diff --git a/scripts b/scripts
deleted file mode 160000
index 51a9c65..0000000
--- a/scripts
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 51a9c65a58221e53048db32ae05216452be25723