diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index c3081c1b..252f56ac 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -586,7 +586,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 644; + CURRENT_PROJECT_VERSION = 645; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -596,7 +596,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.644; + MARKETING_VERSION = 1.0.645; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -720,7 +720,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 644; + CURRENT_PROJECT_VERSION = 645; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -730,7 +730,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.644; + MARKETING_VERSION = 1.0.645; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -748,7 +748,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 644; + CURRENT_PROJECT_VERSION = 645; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -758,7 +758,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.644; + MARKETING_VERSION = 1.0.645; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -779,7 +779,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 644; + CURRENT_PROJECT_VERSION = 645; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -792,7 +792,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.644; + MARKETING_VERSION = 1.0.645; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; @@ -818,7 +818,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 644; + CURRENT_PROJECT_VERSION = 645; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -831,7 +831,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.644; + MARKETING_VERSION = 1.0.645; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -854,7 +854,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 644; + CURRENT_PROJECT_VERSION = 645; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -867,7 +867,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.644; + MARKETING_VERSION = 1.0.645; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -890,7 +890,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 644; + CURRENT_PROJECT_VERSION = 645; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -902,7 +902,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.644; + MARKETING_VERSION = 1.0.645; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; @@ -931,7 +931,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 644; + CURRENT_PROJECT_VERSION = 645; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -943,7 +943,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.644; + MARKETING_VERSION = 1.0.645; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; @@ -969,7 +969,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 644; + CURRENT_PROJECT_VERSION = 645; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -981,7 +981,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.644; + MARKETING_VERSION = 1.0.645; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; diff --git a/lib/data/model/app/shell_func.dart b/lib/data/model/app/shell_func.dart index 3db42baa..ec23e04c 100644 --- a/lib/data/model/app/shell_func.dart +++ b/lib/data/model/app/shell_func.dart @@ -239,7 +239,7 @@ enum DockerCmdType { } } - static final execAll = values.map((e) => e.exec).join(_cmdDivider); + static final execAll = values.map((e) => e.exec).join(' && echo $seperator && '); } enum BSDStatusCmdType { diff --git a/lib/data/provider/docker.dart b/lib/data/provider/docker.dart index bd0aed26..2e623954 100644 --- a/lib/data/provider/docker.dart +++ b/lib/data/provider/docker.dart @@ -64,7 +64,7 @@ class DockerProvider extends ChangeNotifier { final segments = raw.split(seperator); if (segments.length != DockerCmdType.values.length) { error = DockerErr(type: DockerErrType.segmentsNotMatch); - Loggers.parse.warning('Docker segments: ${segments.length}'); + Loggers.parse.warning('Docker segments: ${segments.length}\n$raw'); notifyListeners(); return; } @@ -171,16 +171,14 @@ class DockerProvider extends ChangeNotifier { return null; } - // wrap cmd with `docker host & sudo` + /// wrap cmd with `docker host` String _wrap(String cmd) { - final dockerHost = Stores.docker.fetch(hostId!); - if (dockerHost == null || dockerHost.isEmpty) { - if (userName != 'root') { - return 'sudo $cmd'; - } - } else { + final dockerHost = Stores.docker.fetch(hostId); + cmd = 'export LANG=en_US.UTF-8 && $cmd'; + final noDockerHost = dockerHost?.isEmpty ?? true; + if (!noDockerHost) { cmd = 'export DOCKER_HOST=$dockerHost && $cmd'; } - return 'export LANG=en_US.UTF-8 && $cmd'; + return cmd; } } diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 6d782f92..2e4dd566 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,9 +2,9 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 644; + static const int build = 645; static const String engine = "3.16.0"; - static const String buildAt = "2023-11-20 11:49:47"; - static const int modifications = 4; - static const int script = 26; + static const String buildAt = "2023-11-20 16:47:25"; + static const int modifications = 5; + static const int script = 27; } diff --git a/lib/data/store/docker.dart b/lib/data/store/docker.dart index 6773c659..3fb2ccb4 100644 --- a/lib/data/store/docker.dart +++ b/lib/data/store/docker.dart @@ -3,7 +3,7 @@ import '../../core/persistant_store.dart'; class DockerStore extends PersistentStore { DockerStore() : super('docker'); - String? fetch(String id) { + String? fetch(String? id) { return box.get(id); } diff --git a/lib/view/page/docker.dart b/lib/view/page/docker.dart index 5948636f..3023045b 100644 --- a/lib/view/page/docker.dart +++ b/lib/view/page/docker.dart @@ -459,7 +459,7 @@ class _DockerManagePageState extends State { Future _showEditHostDialog() async { final id = widget.spi.id; - final host = Stores.docker.fetch(id) ?? 'unix:///run/user/1000/docker.sock'; + final host = Stores.docker.fetch(id); final ctrl = TextEditingController(text: host); await context.showRoundDialog( title: Text(l10n.dockerEditHost), @@ -467,6 +467,7 @@ class _DockerManagePageState extends State { maxLines: 2, controller: ctrl, onSubmitted: _onSaveDockerHost, + hint: 'unix:///run/user/1000/docker.sock', ), actions: [ TextButton(