From d32c850ede6ce6efed13ccadde86b01f19935e1a Mon Sep 17 00:00:00 2001
From: eyedeekay <idk@mulder>
Date: Tue, 12 Mar 2024 21:14:06 -0400
Subject: [PATCH] use relative path when calling wsl

---
 .github/workflows/ant.yml     | 2 +-
 buildscripts/zip.sh           | 2 +-
 src/win/torbrowser-windows.sh | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index 584edde..df871cd 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -81,7 +81,7 @@ jobs:
           git config --global user.name "eyedeekay Github CI Build"
       - uses: actions/checkout@v4
       - run: wsl apt-get update
-      - run: wsl apt-get install -y nsis nsis-common nsis-pluginapi wget dos2unix curl jq gpg gettext zip
+      - run: wsl apt-get install -y nsis nsis-common nsis-pluginapi wget dos2unix curl jq gpg gettext zip 7z
       - run: choco install wget
       - name: Set up JDK 21
         uses: actions/setup-java@v4
diff --git a/buildscripts/zip.sh b/buildscripts/zip.sh
index 8eab897..5c523ff 100755
--- a/buildscripts/zip.sh
+++ b/buildscripts/zip.sh
@@ -16,7 +16,7 @@ TORSOCKS=$(which torsocks)
 if [ -f "${TORSOCKS}" ]; then
     . "${TORSOCKS}" on
 fi
-which wsl && wsl "$SCRIPT_DIR"/src/win/torbrowser-windows.sh
+which wsl && wsl ../src/win/torbrowser-windows.sh
 which wsl || "$SCRIPT_DIR"/src/win/torbrowser-windows.sh
 version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
 . "${TORSOCKS}" off
diff --git a/src/win/torbrowser-windows.sh b/src/win/torbrowser-windows.sh
index 20a71cd..04ac6d3 100755
--- a/src/win/torbrowser-windows.sh
+++ b/src/win/torbrowser-windows.sh
@@ -24,5 +24,4 @@ fi
 
 gpgv --keyring ./tor.keyring "tor-browser-windows-x86_64-portable-${version}.exe.asc" "tor-browser-windows-x86_64-portable-${version}.exe"
 
-WINE=$(which wine)
 7z x "tor-browser-windows-x86_64-portable-${version}.exe" -o "Tor Browser"
\ No newline at end of file