list outputs non-recursively, only directories, only first 2 levels

list outputs
Fix 7z command
2024-03-12 23:20:57 -04:00 · 2024-03-12 22:54:03 -04:00 · 2024-03-12 22:37:46 -04:00 · 2024-03-12 22:16:18 -04:00 · 2024-03-12 21:58:22 -04:00 · 2024-03-12 21:35:10 -04:00
3 changed files with 6 additions and 5 deletions
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -81,7 +81,8 @@ 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-cache search 7zip
+      - run: wsl apt-get install -y nsis nsis-common nsis-pluginapi wget dos2unix curl jq gpg gettext zip p7zip-full ca-certificates
      - run: choco install wget
      - name: Set up JDK 21
        uses: actions/setup-java@v4
@@ -89,7 +90,7 @@ jobs:
          java-version: '21'
          distribution: 'temurin'
      - name: build with script
-        run: bash -c "./buildscripts/zip.sh; ls *.zip"
+        run: bash -c "./buildscripts/zip.sh; ls -d * */* "
      - name: Upload I2P-windows-portable.zip
        uses: actions/upload-artifact@v4
        with:
--- 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
--- a/src/win/torbrowser-windows.sh
+++ b/src/win/torbrowser-windows.sh
@@ -24,5 +24,5 @@ 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"
+7z x "tor-browser-windows-x86_64-portable-${version}.exe" -o"Tor Browser"
+#7z --help
Author	SHA1	Message	Date
eyedeekay	b4a3691aae	list outputs non-recursively, only directories, only first 2 levels	2024-03-12 23:20:57 -04:00
eyedeekay	03748e0c0e	list outputs	2024-03-12 22:54:03 -04:00
eyedeekay	d4a40e8c86	Fix 7z command	2024-03-12 22:37:46 -04:00
eyedeekay	d38fadc902	get 7z help for version	2024-03-12 22:16:18 -04:00
eyedeekay	dbb865603a	figure out where install ca-certificates	2024-03-12 21:58:22 -04:00
eyedeekay	456b26a860	figure out where wsl keeps 7zip	2024-03-12 21:35:10 -04:00
eyedeekay	62284056c3	figure out where wsl keeps 7zip	2024-03-12 21:30:02 -04:00
eyedeekay	41c06c821c	use 7zip when unpacking TBB into Portable	2024-03-12 21:19:31 -04:00
eyedeekay	d32c850ede	use relative path when calling wsl	2024-03-12 21:14:06 -04:00