From 0746319eae2a2ad6617c3c9eb51d0c2d199cca1d Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Thu, 13 Feb 2025 14:55:47 -0800
Subject: [PATCH] Fix update script paths

---
 .github/workflows/update.yml | 10 ++++------
 ci/update-nur-combined.sh    |  2 +-
 ci/update-nur-search.sh      |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index fc801002d..4c9e77250 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -62,7 +62,6 @@ jobs:
       with:
         repository: nix-community/NUR
         fetch-depth: '0'
-        path: nur
     - uses: actions/checkout@v4
       with:
         repository: nix-community/nur-combined
@@ -74,12 +73,12 @@ jobs:
         extra_nix_config: |
           experimental-features = nix-command flakes
     - name: update nur-combined
-      run: ./nur/ci/update-nur-combined.sh
+      run: ./ci/update-nur-combined.sh
       env:
         API_TOKEN_GITHUB: '${{ steps.get_workflow_token.outputs.token }}'
     - name: rebase and push
       run: |
-        source ./nur/ci/lib/setup-git.sh
+        source ./ci/lib/setup-git.sh
         git -C $GITHUB_WORKSPACE/nur-combined pull --rebase origin master
         git -C $GITHUB_WORKSPACE/nur-combined push origin HEAD:master
       env:
@@ -100,7 +99,6 @@ jobs:
       with:
         repository: nix-community/NUR
         fetch-depth: '0'
-        path: nur
     - uses: actions/checkout@v4
       with:
         repository: nix-community/nur-combined
@@ -118,12 +116,12 @@ jobs:
         extra_nix_config: |
           experimental-features = nix-command flakes
     - name: update nur-search/data/packages.json
-      run: ./nur/ci/update-nur-search.sh
+      run: ./ci/update-nur-search.sh
       env:
         API_TOKEN_GITHUB: '${{ steps.get_workflow_token.outputs.token }}'
     - name: rebase and push
       run: |
-        source ./nur/ci/lib/setup-git.sh
+        source ./ci/lib/setup-git.sh
         git -C $GITHUB_WORKSPACE/nur-search pull --rebase origin master
         git -C $GITHUB_WORKSPACE/nur-search push origin HEAD:master
       env:
diff --git a/ci/update-nur-combined.sh b/ci/update-nur-combined.sh
index fef904566..05d01deb1 100755
--- a/ci/update-nur-combined.sh
+++ b/ci/update-nur-combined.sh
@@ -9,7 +9,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 source ${DIR}/lib/setup-git.sh
 set -x
 
-cd ${DIR}/../..
+cd "${DIR}/.."
 
 nix run "${DIR}#" -- combine nur-combined
 
diff --git a/ci/update-nur-search.sh b/ci/update-nur-search.sh
index c97e9bf1e..80ebdbfff 100755
--- a/ci/update-nur-search.sh
+++ b/ci/update-nur-search.sh
@@ -14,7 +14,7 @@ set -x
 
 nix build "${DIR}#"
 
-cd "${DIR}/../.."
+cd "${DIR}/.."
 
 nix run "${DIR}#" -- index nur-combined > nur-search/data/packages.json