From 8b8da663ffc7d7c893ad728d9ff5bd751e36aa44 Mon Sep 17 00:00:00 2001
From: Rashil Gandhi <rashil2000@gmail.com>
Date: Tue, 11 Jan 2022 14:45:09 +0530
Subject: [PATCH] git-filter-repo: Remove extract_dir

Fixes #3042
Fixes #1082
Fixes #1869
---
 bucket/git-filter-repo.json | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/bucket/git-filter-repo.json b/bucket/git-filter-repo.json
index 926b804758..a7a4e85d1c 100644
--- a/bucket/git-filter-repo.json
+++ b/bucket/git-filter-repo.json
@@ -3,19 +3,21 @@
     "description": "git filter-branch replacement",
     "homepage": "https://github.com/newren/git-filter-repo",
     "license": "MIT",
-    "notes": "Using Python 3",
     "suggest": {
         "Python 3": "python"
     },
     "url": "https://github.com/newren/git-filter-repo/archive/v2.34.0.zip",
     "hash": "6425c8d7f60cabf1afec27673658e1ee5f6acab02f4363cc3f06a6089f1d8ab4",
-    "extract_dir": "git-filter-repo-2.34.0",
-    "pre_install": "Set-Content -Path \"$dir\\git-filter-repo.ps1\" -Value \"python3 '$dir\\git-filter-repo' @args\"",
-    "post_install": "New-Item -ItemType SymbolicLink -Path \"$dir\\contrib\\filter-repo-demos\\git_filter_repo.py\" -Target \"$dir\\git-filter-repo\" | Out-Null",
-    "bin": "git-filter-repo.ps1",
+    "pre_install": "Move-Item \"$dir\\git-filter-repo-*\\*\" \"$dir\"; Remove-Item \"$dir\\git-filter-repo-*\"",
+    "post_install": "Copy-Item \"$dir\\git-filter-repo\" \"$dir\\contrib\\filter-repo-demos\" | Out-Null",
+    "bin": [
+        [
+            "git_filter_repo.py",
+            "git-filter-repo"
+        ]
+    ],
     "checkver": "github",
     "autoupdate": {
-        "url": "https://github.com/newren/git-filter-repo/archive/v$version.zip",
-        "extract_dir": "git-filter-repo-$version"
+        "url": "https://github.com/newren/git-filter-repo/archive/v$version.zip"
     }
 }