From 790f5a5f2f50f63e4e65c9f3f2ca2e8d497ec9ed Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 18 Mar 2019 09:10:13 -0400
Subject: [PATCH] properly extract and untar keytar.node

---
 appveyor.yml | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index a5560ac9..2570b242 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -50,27 +50,25 @@ install:
       #$keytarVersion = (Get-Content -Raw -Path .\src\package.json | ConvertFrom-Json).dependencies.keytar
       $keytarVersion = "4.4.1"
       $nodeModVersion = node -e "console.log(process.config.variables.node_module_version)"
-      $keytarTarGz = "keytar-v${keytarVersion}-node-v${nodeModVersion}-{0}-x64.tar.gz"
+      $keytarTar = "keytar-v${keytarVersion}-node-v${nodeModVersion}-{0}-x64.tar"
+      $keytarTarGz = "${keytarTar}.gz"
       $keytarUrl = "https://github.com/atom/node-keytar/releases/download/v${keytarVersion}/${keytarTarGz}"
-      $keytarOutDir = ".\keytar\{0}"
 
-      New-Item -ItemType directory -Path $($keytarOutDir -f "windows") | Out-Null
-      New-Item -ItemType directory -Path $($keytarOutDir -f "macos") | Out-Null
-      New-Item -ItemType directory -Path $($keytarOutDir -f "linux") | Out-Null
+      New-Item -ItemType directory -Path .\keytar\macos | Out-Null
+      New-Item -ItemType directory -Path .\keytar\linux | Out-Null
+      New-Item -ItemType directory -Path .\keytar\windows | Out-Null
 
-      Invoke-RestMethod -Uri $($keytarUrl -f "darwin") `
-        -OutFile $($($keytarOutDir -f "macos") + "\" + $($keytarTarGz -f "darwin"))
-      Invoke-RestMethod -Uri $($keytarUrl -f "linux") `
-        -OutFile $($($keytarOutDir -f "linux") + "\" + $($keytarTarGz -f "linux"))
-      Invoke-RestMethod -Uri $($keytarUrl -f "win32") `
-        -OutFile $($($keytarOutDir -f "windows") + "\" + $($keytarTarGz -f "win32"))
+      Invoke-RestMethod -Uri $($keytarUrl -f "darwin") -OutFile ".\keytar\macos\$($keytarTarGz -f "darwin")"
+      Invoke-RestMethod -Uri $($keytarUrl -f "linux") -OutFile ".\keytar\linux\$($keytarTarGz -f "linux")"
+      Invoke-RestMethod -Uri $($keytarUrl -f "win32") -OutFile ".\keytar\windows\$($keytarTarGz -f "win32")"
 
-      7z x -so $($($keytarOutDir -f "macos") + "\" + $($keytarTarGz -f "darwin")) | `
-        7z x -aoa -si -ttar -o"$($keytarOutDir -f "macos")"
-      7z x -so $($($keytarOutDir -f "linux") + "\" + $($keytarTarGz -f "linux")) | `
-        7z x -aoa -si -ttar -o"$($keytarOutDir -f "linux")"
-      7z x -so $($($keytarOutDir -f "windows") + "\" + $($keytarTarGz -f "win32")) | `
-        7z x -aoa -si -ttar -o"$($keytarOutDir -f "windows")"
+      7z e ".\keytar\macos\$($keytarTarGz -f "darwin")" -o".\keytar\macos"
+      7z e ".\keytar\linux\$($keytarTarGz -f "linux")" -o".\keytar\linux"
+      7z e ".\keytar\windows\$($keytarTarGz -f "win32")" -o".\keytar\windows"
+
+      7z e ".\keytar\macos\$($keytarTar -f "darwin")" -o".\keytar\macos"
+      7z e ".\keytar\linux\$($keytarTar -f "linux")" -o".\keytar\linux"
+      7z e ".\keytar\windows\$($keytarTar -f "win32")" -o".\keytar\windows"
     }
 
 before_build:
@@ -90,9 +88,9 @@ build_script:
 - cmd: npm run dist:win:ci
 - cmd: npm run reset
 - cmd: npm run dist:cli
-- cmd: 7z a ./dist-cli/bwdc-windows-%PACKAGE_VERSION%.zip ./dist-cli/windows/bwdc.exe ./keytar/windows/build/Release/keytar.node
-- cmd: 7z a ./dist-cli/bwdc-macos-%PACKAGE_VERSION%.zip ./dist-cli/macos/bwdc ./keytar/macos/build/Release/keytar.node
-- cmd: 7z a ./dist-cli/bwdc-linux-%PACKAGE_VERSION%.zip ./dist-cli/linux/bwdc ./keytar/linux/build/Release/keytar.node
+- cmd: 7z a ./dist-cli/bwdc-windows-%PACKAGE_VERSION%.zip ./dist-cli/windows/bwdc.exe ./keytar/windows/keytar.node
+- cmd: 7z a ./dist-cli/bwdc-macos-%PACKAGE_VERSION%.zip ./dist-cli/macos/bwdc ./keytar/macos/keytar.node
+- cmd: 7z a ./dist-cli/bwdc-linux-%PACKAGE_VERSION%.zip ./dist-cli/linux/bwdc ./keytar/linux/keytar.node
 - ps: |
     if($isWindows) {
       checksum -f="./dist-cli/bwdc-windows-${env:PACKAGE_VERSION}.zip" `