Remove extra /bin/ in picotool path for Win/Mac (#32)

earlephilhower · Nov 21, 2023 · 122f0b6 · 122f0b6
1 parent fb4d23a
commit 122f0b6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -37,13 +37,12 @@ jobs:
 
         # Package
         mkdir /tmp/picotool
-        mkdir /tmp/picotool/bin
-        cp -a /usr/local/Cellar/hidapi/*/lib/*.dylib /tmp/picotool/bin/.
-        cp -a /usr/local/Cellar/libusb/*/lib/*.dylib /tmp/picotool/bin/.
-        cp -a /usr/local/Cellar/capstone/*/lib/*.dylib /tmp/picotool/bin/.
-        cp -a picotool /tmp/picotool/bin/.
-        cp -a ../LICENSE.TXT /tmp/picotool/bin/.
-        cp -a ../README.md /tmp/picotool/bin/.
+        cp -a /usr/local/Cellar/hidapi/*/lib/*.dylib /tmp/picotool/.
+        cp -a /usr/local/Cellar/libusb/*/lib/*.dylib /tmp/picotool/.
+        cp -a /usr/local/Cellar/capstone/*/lib/*.dylib /tmp/picotool/.
+        cp -a picotool /tmp/picotool/.
+        cp -a ../LICENSE.TXT /tmp/picotool/.
+        cp -a ../README.md /tmp/picotool/.
         tar cvf ../../picotool.macos.tar -C /tmp picotool
 
     - name: Upload Picotool

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -41,12 +41,11 @@ jobs:
 
         # Package
         mkdir /tmp/picotool
-        mkdir /tmp/picotool/bin
-        cp /mingw*/bin/libhidapi*.dll /tmp/picotool/bin/.
-        cp /mingw*/bin/libusb*.dll /tmp/picotool/bin/.
-        cp -a picotool.exe /tmp/picotool/bin/.
-        cp -a ../LICENSE.TXT /tmp/picotool/bin/.
-        cp -a ../README.md /tmp/picotool/bin/.
+        cp /mingw*/bin/libhidapi*.dll /tmp/picotool/.
+        cp /mingw*/bin/libusb*.dll /tmp/picotool/.
+        cp -a picotool.exe /tmp/picotool/.
+        cp -a ../LICENSE.TXT /tmp/picotool/.
+        cp -a ../README.md /tmp/picotool/.
         tar cvf ../../picotool.${{matrix.env}}.tar -C /tmp picotool
 
     - name: Upload Picotool ${{matrix.env}}