diff --git a/.gitignore b/.gitignore index b4f839af..301bb599 100644 --- a/.gitignore +++ b/.gitignore @@ -48,7 +48,6 @@ app.*.map.json /android/app/fjy.androidstudio.key /release test.dart -.fvm # Keep generated l10n files /.dart_tool/* diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 617049cb..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dart.flutterSdkPath": ".fvm", - "files.watcherExclude": { - "**/.fvm": true - }, - "git.ignoredRepositories": [ - ".fvm" - ], - "search.exclude": { - "**/.fvm": true - } -} \ No newline at end of file diff --git a/README_zh.md b/README_zh.md index 7bea1f1a..67c9cdf9 100644 --- a/README_zh.md +++ b/README_zh.md @@ -40,7 +40,6 @@ ## 🆘 帮助 -**可能**更适合大陆地区的 [QQ](https://qm.qq.com/q/cpcFYXixgs) 或 [邮箱](mailto:lollipopkit@qq.com) 反馈。 如果你有任何问题或者功能请求,请在 [讨论](https://github.com/lollipopkit/flutter_server_box/discussions/new/choose) 中交流。 如果 ServerBox app 有任何 bug,请在 [问题](https://github.com/lollipopkit/flutter_server_box/issues/new) 中反馈。 diff --git a/make.dart b/make.dart index 4b858c40..046f51a1 100755 --- a/make.dart +++ b/make.dart @@ -1,4 +1,4 @@ -#!/usr/bin/env fvm dart +#!/usr/bin/env dart // ignore_for_file: avoid_print import 'dart:convert'; @@ -21,10 +21,6 @@ const buildFuncs = { int? build; -Future fvmRun(List args) async { - return await Process.run('fvm', args, runInShell: true); -} - Future getGitCommitCount() async { final result = await Process.run('git', ['log', '--oneline']); build = (result.stdout as String) @@ -58,7 +54,7 @@ Future getGitModificationCount() async { } Future getFlutterVersion() async { - final result = await fvmRun(['flutter', '--version']); + final result = await Process.run('flutter', ['--version']); final stdout = result.stdout as String; return stdout.split('\n')[0].split('•')[0].split(' ')[1].trim(); } @@ -87,7 +83,7 @@ Future updateBuildData() async { } Future dartFormat() async { - final result = await fvmRun(['dart', 'format', '.']); + final result = await Process.run('dart', ['format', '.']); print(result.stdout); if (result.exitCode != 0) { print(result.stderr); @@ -95,10 +91,10 @@ Future dartFormat() async { } } -void flutterRun(String? mode) { - Process.start( - 'fvm', mode == null ? ['flutter', 'run'] : ['flutter', 'run', '--$mode'], - mode: ProcessStartMode.inheritStdio, runInShell: true); +Future getFileSha1(String path) async { + final result = await Process.run('shasum', ['-a', '1', path]); + final stdout = result.stdout as String; + return stdout.split(' ')[0]; } Future flutterBuild(String buildType) async { @@ -120,7 +116,7 @@ Future flutterBuild(String buildType) async { ]); } print('\n[$buildType]\nBuilding with args: ${args.join(' ')}'); - final buildResult = await fvmRun(['flutter', ...args]); + final buildResult = await Process.run('flutter', args); final exitCode = buildResult.exitCode; if (exitCode != 0) { @@ -146,12 +142,13 @@ Future flutterBuildAndroid() async { } Future scp2CDN() async { + final sha1 = await getFileSha1(apkPath); + print('SHA1: $sha1'); final result = await Process.run( 'scp', - [apkPath, 'hk:/var/www/res/serverbox/apks/$build.apk'], + [apkPath, 'hk:/var/www/res/serverbox/apks/$sha1.apk'], runInShell: true, ); - print(result.stdout); if (result.exitCode != 0) { print(result.stderr); exit(1);