diff --git a/Make.bat b/Make.bat index d1d7335d3..ffa2e9ad2 100644 --- a/Make.bat +++ b/Make.bat @@ -272,17 +272,11 @@ REM Main build sequence Ends REM YARN END REM WGET - REM Comment out the below for loop as the latest version (0.57.0) having - REM some problem, so for the time being hardcoded the version to 0.55.0 - REM FOR /f "tokens=2 delims='" %%i IN ('yarn info nw ^| findstr "latest: "') DO SET "NW_VERSION=%%i" - REM :GET_NW - REM wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" - REM IF %ERRORLEVEL% NEQ 0 GOTO GET_NW + FOR /f "tokens=2 delims='" %%i IN ('yarn info nw ^| findstr "latest: "') DO SET "NW_VERSION=%%i" + :GET_NW + wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" + IF %ERRORLEVEL% NEQ 0 GOTO GET_NW - REM tar -C "%TMPDIR%" -xvf "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" || EXIT /B 1 - - SET "NW_VERSION=0.55.0" - wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" tar -C "%TMPDIR%" -xvf "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" || EXIT /B 1 REM WGET END diff --git a/pkg/linux/build-functions.sh b/pkg/linux/build-functions.sh index f6364f760..4c32145da 100644 --- a/pkg/linux/build-functions.sh +++ b/pkg/linux/build-functions.sh @@ -125,10 +125,8 @@ _build_runtime() { # YARN END # WGET: - # Comment out the below line as the latest version (0.57.0) having some - # problem, so for the time being hardcoded the version to 0.55.0 - # NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}') - NW_VERSION="0.55.0" + NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}') + pushd "${BUILDROOT}" > /dev/null while true;do wget https://dl.nwjs.io/v${NW_VERSION}/nwjs-v${NW_VERSION}-linux-x64.tar.gz && break diff --git a/pkg/mac/build-functions.sh b/pkg/mac/build-functions.sh index 10f27ac0f..506db8f87 100644 --- a/pkg/mac/build-functions.sh +++ b/pkg/mac/build-functions.sh @@ -33,10 +33,8 @@ _build_runtime() { # YARN END # WGET: - # Comment out the below line as the latest version (0.57.0) having some - # problem, so for the time being hardcoded the version to 0.55.0 - # NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}') - NW_VERSION="0.55.0" + NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}') + pushd "${BUILD_ROOT}" > /dev/null while true;do wget https://dl.nwjs.io/v${NW_VERSION}/nwjs-v${NW_VERSION}-osx-x64.zip && break diff --git a/runtime/package.json b/runtime/package.json index 17e1b7fe5..9cac93c57 100644 --- a/runtime/package.json +++ b/runtime/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "eslint": "^6.3.0", - "nw": "0.59.0" + "nw": "^0.59.0" }, "scripts": { "linter": "yarn eslint --no-eslintrc -c .eslintrc.js --ext .js ." diff --git a/runtime/yarn.lock b/runtime/yarn.lock index 17865f431..fcb496657 100644 --- a/runtime/yarn.lock +++ b/runtime/yarn.lock @@ -1008,7 +1008,7 @@ number-is-nan@^1.0.0: resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= -nw@0.59.0: +nw@^0.59.0: version "0.59.0" resolved "https://registry.yarnpkg.com/nw/-/nw-0.59.0.tgz#c7eff1622c917834b2b31581ba5c386816d98db1" integrity sha512-cLGZgP+u+nDfgT956Z7timXuyQN8OOi5Ele6OF3yVEkk6CNiMC6m2rblb5aB8y4QNwLf6O+tkt64XxSUPxvutQ==