diff --git a/other/keytar/keytar.node/README.md b/other/keytar/keytar.node/README.md index 0dd23983..d883f86c 100644 --- a/other/keytar/keytar.node/README.md +++ b/other/keytar/keytar.node/README.md @@ -1,6 +1,3 @@ ### node-keytar bindings Copy this directory to `node_modules/keytar/build/Release/keytar.node` to use. - -keytar-4.3.0/linux-x64-64.node - poweredge-t30.fancy.org.uk -All others - https://github.com/atom/node-keytar/releases diff --git a/other/keytar/keytar.node/index.js b/other/keytar/keytar.node/index.js index 351a3b6d..32df2e13 100644 --- a/other/keytar/keytar.node/index.js +++ b/other/keytar/keytar.node/index.js @@ -1,4 +1,3 @@ const keytar_version = require('keytar/package').version; -// module.exports = require('./keytar-' + process.platform + '-' + process.versions.modules + '-' + process.arch + '.node'); module.exports = require(`./keytar-${keytar_version}/${process.platform}-${process.arch}-${process.versions.modules}.node`); diff --git a/other/keytar/keytar.node/keytar-4.4.1/darwin-x64-64.node b/other/keytar/keytar.node/keytar-4.4.1/darwin-x64-64.node new file mode 100755 index 00000000..62d0730c Binary files /dev/null and b/other/keytar/keytar.node/keytar-4.4.1/darwin-x64-64.node differ diff --git a/scripts/build-keytar-darwin.sh b/scripts/build-keytar-darwin.sh index 954e2de0..ce587e0a 100644 --- a/scripts/build-keytar-darwin.sh +++ b/scripts/build-keytar-darwin.sh @@ -3,12 +3,7 @@ PLATFORM="darwin" ARCH="x64" -NODE_API_VERSION="53" -ELECTRON_VERSION="1.6.15" - -scripts/build-keytar.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION - NODE_API_VERSION="64" -ELECTRON_VERSION="4.0.0-beta.7" +ELECTRON_VERSION="4.0.0-beta.11" scripts/build-keytar.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION diff --git a/scripts/build-keytar-linux.sh b/scripts/build-keytar-linux.sh index fe97eb64..74bdc6f8 100755 --- a/scripts/build-keytar-linux.sh +++ b/scripts/build-keytar-linux.sh @@ -3,12 +3,7 @@ PLATFORM="linux" ARCH="x64" -NODE_API_VERSION="53" -ELECTRON_VERSION="1.6.15" - -scripts/build-keytar.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION - NODE_API_VERSION="64" -ELECTRON_VERSION="4.0.0-beta.7" +ELECTRON_VERSION="4.0.0-beta.11" scripts/build-keytar.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION diff --git a/scripts/build-keytar.sh b/scripts/build-keytar.sh index 779a02d9..424adbeb 100755 --- a/scripts/build-keytar.sh +++ b/scripts/build-keytar.sh @@ -4,9 +4,10 @@ PLATFORM="$1" ARCH="$2" NODE_API_VERSION="$3" ELECTRON_VERSION="$4" +KEYTAR_VERSION="4.4.1" ELECTRON_URL="https://atom.io/download/electron" -DIRECTORY="release-tmp/keytar.node/keytar-4.3.0" +DIRECTORY="release-tmp/keytar.node/keytar-$KEYTAR_VERSION" FILENAME="$PLATFORM-$ARCH-$NODE_API_VERSION.node" if [ `node -p 'process.platform'` != "$PLATFORM" ]; then diff --git a/scripts/build-node-sass-darwin.sh b/scripts/build-node-sass-darwin.sh index f6c9ba17..214b29fb 100755 --- a/scripts/build-node-sass-darwin.sh +++ b/scripts/build-node-sass-darwin.sh @@ -3,12 +3,7 @@ PLATFORM="darwin" ARCH="x64" -NODE_API_VERSION="53" -ELECTRON_VERSION="1.6.15" - -scripts/build-node-sass.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION - NODE_API_VERSION="64" -ELECTRON_VERSION="4.0.0-beta.7" +ELECTRON_VERSION="4.0.0-beta.11" scripts/build-node-sass.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION diff --git a/scripts/build-node-sass-linux.sh b/scripts/build-node-sass-linux.sh index 9e45082d..4f4a953f 100755 --- a/scripts/build-node-sass-linux.sh +++ b/scripts/build-node-sass-linux.sh @@ -3,12 +3,7 @@ PLATFORM="linux" ARCH="x64" -NODE_API_VERSION="53" -ELECTRON_VERSION="1.6.15" - -scripts/build-node-sass.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION - NODE_API_VERSION="64" -ELECTRON_VERSION="4.0.0-beta.7" +ELECTRON_VERSION="4.0.0-beta.11" scripts/build-node-sass.sh $PLATFORM $ARCH $NODE_API_VERSION $ELECTRON_VERSION diff --git a/scripts/build-node-sass-win32.bat b/scripts/build-node-sass-win32.bat index c4a599fc..98fb3233 100644 --- a/scripts/build-node-sass-win32.bat +++ b/scripts/build-node-sass-win32.bat @@ -1,13 +1,7 @@ set "PLATFORM=win32" -set "NODE_API_VERSION=53" -set "ELECTRON_VERSION=1.6.15" - -call ./scripts/build-node-sass.bat %PLATFORM% ia32 %NODE_API_VERSION% %ELECTRON_VERSION% -call ./scripts/build-node-sass.bat %PLATFORM% x64 %NODE_API_VERSION% %ELECTRON_VERSION% - set "NODE_API_VERSION=64" -set "ELECTRON_VERSION=4.0.0-beta.7" +set "ELECTRON_VERSION=4.0.0-beta.11" call ./scripts/build-node-sass.bat %PLATFORM% ia32 %NODE_API_VERSION% %ELECTRON_VERSION% call ./scripts/build-node-sass.bat %PLATFORM% x64 %NODE_API_VERSION% %ELECTRON_VERSION%