Merge remote-tracking branch 'origin/master'
This commit is contained in:
@ -93,9 +93,9 @@ python -m scientific_surfing core update [--version <version>] [--force]
|
||||
|
||||
### Service Management
|
||||
|
||||
macOS
|
||||
```bash
|
||||
sudo env SF_CONFIG_DIR=(readlink -f ~/basicfiles/cli/scientific_surfing) python -m scientific_surfing core service install
|
||||
Linux / macOS
|
||||
```nushell
|
||||
sudo env SF_CONFIG_DIR=(readlink -f ~/basicfiles/cli/scientific_surfing) .venv/bin/python -m scientific_surfing core service install
|
||||
```
|
||||
|
||||
## Development
|
||||
|
||||
@ -303,9 +303,9 @@ class CoreConfigManager:
|
||||
|
||||
# Create final config by merging subscription with user config
|
||||
final_config = deep_merge(subscription_data, config)
|
||||
external_ui = final_config.get("external-ui")
|
||||
if external_ui:
|
||||
final_config["external-ui"] = os.path.join(self.storage.config_dir, external_ui)
|
||||
# external_ui = final_config.get("external-ui")
|
||||
# if 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
|
||||
essential_defaults = {
|
||||
|
||||
Reference in New Issue
Block a user