This commit is contained in:
lollipopkit
2023-08-08 12:52:28 +08:00
parent bd84eeca0b
commit 096d41088f
4 changed files with 11 additions and 28 deletions

1
.gitignore vendored
View File

@@ -48,7 +48,6 @@ app.*.map.json
/android/app/fjy.androidstudio.key /android/app/fjy.androidstudio.key
/release /release
test.dart test.dart
.fvm
# Keep generated l10n files # Keep generated l10n files
/.dart_tool/* /.dart_tool/*

12
.vscode/settings.json vendored
View File

@@ -1,12 +0,0 @@
{
"dart.flutterSdkPath": ".fvm",
"files.watcherExclude": {
"**/.fvm": true
},
"git.ignoredRepositories": [
".fvm"
],
"search.exclude": {
"**/.fvm": true
}
}

View File

@@ -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) 中交流。 如果你有任何问题或者功能请求,请在 [讨论](https://github.com/lollipopkit/flutter_server_box/discussions/new/choose) 中交流。
如果 ServerBox app 有任何 bug请在 [问题](https://github.com/lollipopkit/flutter_server_box/issues/new) 中反馈。 如果 ServerBox app 有任何 bug请在 [问题](https://github.com/lollipopkit/flutter_server_box/issues/new) 中反馈。

View File

@@ -1,4 +1,4 @@
#!/usr/bin/env fvm dart #!/usr/bin/env dart
// ignore_for_file: avoid_print // ignore_for_file: avoid_print
import 'dart:convert'; import 'dart:convert';
@@ -21,10 +21,6 @@ const buildFuncs = {
int? build; int? build;
Future<ProcessResult> fvmRun(List<String> args) async {
return await Process.run('fvm', args, runInShell: true);
}
Future<void> getGitCommitCount() async { Future<void> getGitCommitCount() async {
final result = await Process.run('git', ['log', '--oneline']); final result = await Process.run('git', ['log', '--oneline']);
build = (result.stdout as String) build = (result.stdout as String)
@@ -58,7 +54,7 @@ Future<int> getGitModificationCount() async {
} }
Future<String> getFlutterVersion() async { Future<String> getFlutterVersion() async {
final result = await fvmRun(['flutter', '--version']); final result = await Process.run('flutter', ['--version']);
final stdout = result.stdout as String; final stdout = result.stdout as String;
return stdout.split('\n')[0].split('')[0].split(' ')[1].trim(); return stdout.split('\n')[0].split('')[0].split(' ')[1].trim();
} }
@@ -87,7 +83,7 @@ Future<void> updateBuildData() async {
} }
Future<void> dartFormat() async { Future<void> dartFormat() async {
final result = await fvmRun(['dart', 'format', '.']); final result = await Process.run('dart', ['format', '.']);
print(result.stdout); print(result.stdout);
if (result.exitCode != 0) { if (result.exitCode != 0) {
print(result.stderr); print(result.stderr);
@@ -95,10 +91,10 @@ Future<void> dartFormat() async {
} }
} }
void flutterRun(String? mode) { Future<String> getFileSha1(String path) async {
Process.start( final result = await Process.run('shasum', ['-a', '1', path]);
'fvm', mode == null ? ['flutter', 'run'] : ['flutter', 'run', '--$mode'], final stdout = result.stdout as String;
mode: ProcessStartMode.inheritStdio, runInShell: true); return stdout.split(' ')[0];
} }
Future<void> flutterBuild(String buildType) async { Future<void> flutterBuild(String buildType) async {
@@ -120,7 +116,7 @@ Future<void> flutterBuild(String buildType) async {
]); ]);
} }
print('\n[$buildType]\nBuilding with args: ${args.join(' ')}'); 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; final exitCode = buildResult.exitCode;
if (exitCode != 0) { if (exitCode != 0) {
@@ -146,12 +142,13 @@ Future<void> flutterBuildAndroid() async {
} }
Future<void> scp2CDN() async { Future<void> scp2CDN() async {
final sha1 = await getFileSha1(apkPath);
print('SHA1: $sha1');
final result = await Process.run( final result = await Process.run(
'scp', 'scp',
[apkPath, 'hk:/var/www/res/serverbox/apks/$build.apk'], [apkPath, 'hk:/var/www/res/serverbox/apks/$sha1.apk'],
runInShell: true, runInShell: true,
); );
print(result.stdout);
if (result.exitCode != 0) { if (result.exitCode != 0) {
print(result.stderr); print(result.stderr);
exit(1); exit(1);