okooooooo/clash-for-linux-install
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: null-coalescing operator: // "

Browse Source
This commit is contained in:
--global authored and libm committed 2025-02-13 15:41:14 +08:00
1 parent b5c12800c3
commit 5d1f30f66e
2 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

script/clashctl.sh
+1 -1
View File
@@ -61,7 +61,7 @@ _merge_config_restart() {
function clashsecret() {
case "$#" in
0)
_okcat "当前密钥：$(sudo "$BIN_YQ" '.secret' "$CLASH_CONFIG_RUNTIME")"
_okcat "当前密钥：$(sudo "$BIN_YQ" '.secret // ""' "$CLASH_CONFIG_RUNTIME")"
;;
1)
local secret=$1
script/common.sh
+4 -4
View File
@@ -46,7 +46,7 @@ function _get_os() {
CLASH_CRON_TAB='/var/spool/cron/crontabs/root'
BASHRC='/etc/bash.bashrc'
}
_get_kernel
local cpu_arch=$(uname -m)
# shellcheck disable=SC2086
@@ -54,9 +54,9 @@ function _get_os() {
}
function _get_port() {
local port=$(sudo $BIN_YQ '.port' $CLASH_CONFIG_RUNTIME)
local mixed_port=$(sudo $BIN_YQ '.mixed-port' $CLASH_CONFIG_RUNTIME)
local external_port=$(sudo $BIN_YQ '.external-controller' $CLASH_CONFIG_RUNTIME | cut -d':' -f2)
local port=$(sudo $BIN_YQ '.port // ""' $CLASH_CONFIG_RUNTIME)
local mixed_port=$(sudo $BIN_YQ '.mixed-port // ""' $CLASH_CONFIG_RUNTIME)
local external_port=$(sudo $BIN_YQ '.external-controller // ""' $CLASH_CONFIG_RUNTIME | cut -d':' -f2)
PROXY_PORT="${mixed_port:-${port:-7890}}"
UI_PORT=${external_port:-9090}