Merge remote-tracking branch 'origin/master'

This commit is contained in:
DevChat Tester
2025-11-13 10:45:04 +08:00
2 changed files with 6 additions and 6 deletions

View File

@ -93,9 +93,9 @@ python -m scientific_surfing core update [--version <version>] [--force]
### Service Management ### Service Management
macOS Linux / macOS
```bash ```nushell
sudo env SF_CONFIG_DIR=(readlink -f ~/basicfiles/cli/scientific_surfing) python -m scientific_surfing core service install sudo env SF_CONFIG_DIR=(readlink -f ~/basicfiles/cli/scientific_surfing) .venv/bin/python -m scientific_surfing core service install
``` ```
## Development ## Development

View File

@ -303,9 +303,9 @@ class CoreConfigManager:
# Create final config by merging subscription with user config # Create final config by merging subscription with user config
final_config = deep_merge(subscription_data, config) final_config = deep_merge(subscription_data, config)
external_ui = final_config.get("external-ui") # external_ui = final_config.get("external-ui")
if external_ui: # if external_ui:
final_config["external-ui"] = os.path.join(self.storage.config_dir, external_ui) # final_config["external-ui"] = os.path.join(self.storage.config_dir, external_ui)
# Define essential defaults that should be present in any Clash config # Define essential defaults that should be present in any Clash config
essential_defaults = { essential_defaults = {