From 629165bddaca57d02fe48ba5a48add0c0abb9f16 Mon Sep 17 00:00:00 2001 From: msojocs Date: Sat, 6 Jul 2024 16:16:38 +0800 Subject: [PATCH] fix: runner prepare --- test/runner/module-windows.ts | 2 +- .../nwjs/{wine-prepare.sh => module-prepare.sh} | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) rename test/runner/nwjs/{wine-prepare.sh => module-prepare.sh} (66%) diff --git a/test/runner/module-windows.ts b/test/runner/module-windows.ts index fc76465..24ea378 100644 --- a/test/runner/module-windows.ts +++ b/test/runner/module-windows.ts @@ -71,7 +71,7 @@ export default { wcsc: wcscNative, wcc: wccNative, start: () => { - execFileSync(path.resolve(__dirname, './nwjs/wine-prepare.sh'), { stdio: 'inherit' }) + execFileSync(path.resolve(__dirname, './nwjs/module-prepare.sh')) }, close: () => { request('http://localhost:8083/close').end() diff --git a/test/runner/nwjs/wine-prepare.sh b/test/runner/nwjs/module-prepare.sh similarity index 66% rename from test/runner/nwjs/wine-prepare.sh rename to test/runner/nwjs/module-prepare.sh index 696d3f8..e5689d8 100755 --- a/test/runner/nwjs/wine-prepare.sh +++ b/test/runner/nwjs/module-prepare.sh @@ -5,15 +5,19 @@ root_dir=$(cd `dirname $0`/../../.. && pwd -P) cur_dir=$(cd `dirname $0` && pwd -P) nw_version="0.55.0" - +mkdir -p "$root_dir/cache" if [ ! -f "$root_dir/cache/nwjs-sdk-v$nw_version-win-x64.zip" ];then - wget -c -O "$root_dir/cache/nwjs-sdk-v$nw_version-win-x64.zip.tmp" "https://dl.nwjs.io/v0.55.0/nwjs-v0.55.0-win-x64.zip" + wget -c -O "$root_dir/cache/nwjs-sdk-v$nw_version-win-x64.zip.tmp" "https://dl.nwjs.io/v0.55.0/nwjs-sdk-v0.55.0-win-x64.zip" mv "$root_dir/cache/nwjs-sdk-v$nw_version-win-x64.zip.tmp" "$root_dir/cache/nwjs-sdk-v$nw_version-win-x64.zip" fi +if [ ! -f "$root_dir/cache/nwjs-sdk-v$nw_version-linux-x64.tar.gz" ];then + wget -c -O "$root_dir/cache/nwjs-sdk-v$nw_version-linux-x64.tar.gz.tmp" "https://dl.nwjs.io/v0.55.0/nwjs-sdk-v0.55.0-linux-x64.tar.gz" + mv "$root_dir/cache/nwjs-sdk-v$nw_version-linux-x64.tar.gz.tmp" "$root_dir/cache/nwjs-sdk-v$nw_version-linux-x64.tar.gz" +fi -if [ ! -d "$root_dir/cache/nwjs-sdk-v$nw_version-win-x64" ];then +if [ ! -d "$root_dir/cache/nwjs-sdk-v$nw_version-linux-x64" ];then cd "$root_dir/cache" - unzip "nwjs-sdk-v$nw_version-win-x64.zip" + tar -zxf "nwjs-sdk-v$nw_version-linux-x64.tar.gz" fi rm -rf "$root_dir/cache/nwjs-sdk-v$nw_version-win-x64/package.nw" @@ -39,5 +43,6 @@ docker run -d -it\ sleep 10 curl http://localhost:8083 +exit 0 # curl http://localhost:8083/close # docker stop wine \ No newline at end of file