this should not be this hard

Author: maurymarkowitz

.github/workflows/update-scoop.yml

@@ -50,19 +50,27 @@ jobs:
             find scoop-bucket -maxdepth 4 -type f | sort
             exit 1
           fi
-          SCOOP_ROOT=$(git -C "$(dirname "$SCOOP_JSON")" rev-parse --show-toplevel)
+          echo "Found: $SCOOP_JSON"
+          SCOOP_ROOT=$(git -C "$(dirname "$SCOOP_JSON")" rev-parse --show-toplevel 2>/dev/null || dirname "$(dirname "$SCOOP_JSON")")
+          echo "SCOOP_ROOT=$SCOOP_ROOT"
+          echo "SCOOP_JSON=$SCOOP_JSON"
           sed -i "s/\"version\": \".*\"/\"version\": \"${VERSION}\"/" "$SCOOP_JSON"
           sed -i "s/\"hash\": \".*\"/\"hash\": \"${HASH}\"/" "$SCOOP_JSON"
           sed -i "s|releases/download/.*/retrobasic-windows-x86_64.zip|releases/download/${TAG}/retrobasic-windows-x86_64.zip|" "$SCOOP_JSON"
-          echo "SCOOP_ROOT=$SCOOP_ROOT" >> $GITHUB_ENV
+          echo "SCOOP_JSON=$SCOOP_JSON" >> $GITHUB_ENV
 
       - name: Commit & push updates
         env:
           GH_TOKEN: ${{ secrets.HOMEBREW_AND_SCOOP_TOKEN }}
         run: |
-          git -C "$SCOOP_ROOT" config user.name github-actions
-          git -C "$SCOOP_ROOT" config user.email github-actions@github.com
-          git -C "$SCOOP_ROOT" remote set-url origin "https://x-access-token:${{ secrets.HOMEBREW_AND_SCOOP_TOKEN }}@github.com/maurymarkowitz/scoop-bucket.git"
-          git -C "$SCOOP_ROOT" add bucket/retrobasic.json
-          git -C "$SCOOP_ROOT" commit -m "Update scoop manifest for ${{ github.event.release.tag_name || github.event.inputs.tag_name }}"
-          git -C "$SCOOP_ROOT" push
+          SCOOP_JSON="${{ env.SCOOP_JSON }}"
+          SCOOP_DIR=$(dirname "$(dirname "$SCOOP_JSON")")
+          echo "Using SCOOP_JSON=$SCOOP_JSON"
+          echo "Using SCOOP_DIR=$SCOOP_DIR"
+          cd "$SCOOP_DIR" || exit 1
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+          git remote set-url origin "https://x-access-token:${{ secrets.HOMEBREW_AND_SCOOP_TOKEN }}@github.com/maurymarkowitz/scoop-bucket.git"
+          git add bucket/retrobasic.json
+          git commit -m "Update scoop manifest for ${{ github.event.release.tag_name || github.event.inputs.tag_name }}"
+          git push