remove unused patch label
This commit is contained in:
+4
-3
@@ -33,6 +33,7 @@ is_ignored() {
|
|||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
case "$_name" in $_pattern) return 0 ;; esac
|
case "$_name" in $_pattern) return 0 ;; esac
|
||||||
|
case "$_rel" in $_pattern/*) return 0 ;; esac
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
done < "$IGNORE_FILE"
|
done < "$IGNORE_FILE"
|
||||||
@@ -53,12 +54,12 @@ find "$CORE" -not -path "$CORE/.git/*" -type f | sort | while read -r dst_file;
|
|||||||
if [ -f "$src_file" ]; then
|
if [ -f "$src_file" ]; then
|
||||||
if ! diff -q "$src_file" "$dst_file" > /dev/null 2>&1; then
|
if ! diff -q "$src_file" "$dst_file" > /dev/null 2>&1; then
|
||||||
mkdir -p "$(dirname "$patch_file")"
|
mkdir -p "$(dirname "$patch_file")"
|
||||||
diff -u "$src_file" "$dst_file" > "$patch_file" || true
|
diff -u --label "a/$rel" --label "b/$rel" "$src_file" "$dst_file" > "$patch_file" || true
|
||||||
echo " Modified: $rel"
|
echo " Modified: $rel"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
mkdir -p "$(dirname "$patch_file")"
|
mkdir -p "$(dirname "$patch_file")"
|
||||||
diff -u /dev/null "$dst_file" > "$patch_file" || true
|
diff -u --label /dev/null --label "b/$rel" /dev/null "$dst_file" > "$patch_file" || true
|
||||||
echo " New: $rel"
|
echo " New: $rel"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
@@ -72,7 +73,7 @@ find "$SING_BOX" -not -path "$SING_BOX/.git/*" -type f | sort | while read -r sr
|
|||||||
|
|
||||||
if [ ! -f "$dst_file" ]; then
|
if [ ! -f "$dst_file" ]; then
|
||||||
mkdir -p "$(dirname "$patch_file")"
|
mkdir -p "$(dirname "$patch_file")"
|
||||||
diff -u "$src_file" /dev/null > "$patch_file" || true
|
diff -u --label "a/$rel" --label /dev/null "$src_file" /dev/null > "$patch_file" || true
|
||||||
echo " Deleted: $rel"
|
echo " Deleted: $rel"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|||||||
+4
-3
@@ -29,6 +29,7 @@ function Test-Ignored {
|
|||||||
if ($RelPath -like $pattern) { return $true }
|
if ($RelPath -like $pattern) { return $true }
|
||||||
} else {
|
} else {
|
||||||
if ((Split-Path -Leaf $RelPath) -like $pattern) { return $true }
|
if ((Split-Path -Leaf $RelPath) -like $pattern) { return $true }
|
||||||
|
if ($RelPath -like "$pattern/*") { return $true }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return $false
|
return $false
|
||||||
@@ -53,11 +54,11 @@ Get-ChildItem -Path $Core -Recurse -File | Where-Object {
|
|||||||
$srcHash = (Get-FileHash $srcFile -Algorithm MD5).Hash
|
$srcHash = (Get-FileHash $srcFile -Algorithm MD5).Hash
|
||||||
$dstHash = (Get-FileHash $_.FullName -Algorithm MD5).Hash
|
$dstHash = (Get-FileHash $_.FullName -Algorithm MD5).Hash
|
||||||
if ($srcHash -ne $dstHash) {
|
if ($srcHash -ne $dstHash) {
|
||||||
diff -u $srcFile $_.FullName | Out-File -FilePath $patchFile -Encoding utf8
|
diff -u --label "a/$rel" --label "b/$rel" $srcFile $_.FullName | Out-File -FilePath $patchFile -Encoding utf8
|
||||||
Write-Host " Modified: $rel"
|
Write-Host " Modified: $rel"
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
diff -u /dev/null $_.FullName | Out-File -FilePath $patchFile -Encoding utf8
|
diff -u --label /dev/null --label "b/$rel" /dev/null $_.FullName | Out-File -FilePath $patchFile -Encoding utf8
|
||||||
Write-Host " New: $rel"
|
Write-Host " New: $rel"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -74,7 +75,7 @@ Get-ChildItem -Path $SingBox -Recurse -File | Where-Object {
|
|||||||
if (-not (Test-Path $dstFile)) {
|
if (-not (Test-Path $dstFile)) {
|
||||||
$patchFileDir = Split-Path -Parent $patchFile
|
$patchFileDir = Split-Path -Parent $patchFile
|
||||||
if (-not (Test-Path $patchFileDir)) { New-Item -ItemType Directory -Path $patchFileDir -Force | Out-Null }
|
if (-not (Test-Path $patchFileDir)) { New-Item -ItemType Directory -Path $patchFileDir -Force | Out-Null }
|
||||||
diff -u $_.FullName /dev/null | Out-File -FilePath $patchFile -Encoding utf8
|
diff -u --label "a/$rel" --label /dev/null $_.FullName /dev/null | Out-File -FilePath $patchFile -Encoding utf8
|
||||||
Write-Host " Deleted: $rel"
|
Write-Host " Deleted: $rel"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
--- /data/projects/arknights/omv-dijiang/works/sing-box/cmd/sing-box/cmd_run.go 2026-03-05 11:39:22.614241536 +0800
|
--- a/cmd/sing-box/cmd_run.go
|
||||||
+++ /data/projects/arknights/omv-dijiang/works/core/cmd/sing-box/cmd_run.go 2026-03-05 13:09:50.466040286 +0800
|
+++ b/cmd/sing-box/cmd_run.go
|
||||||
@@ -3,6 +3,7 @@
|
@@ -3,6 +3,7 @@
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
--- /data/projects/arknights/omv-dijiang/works/sing-box/constant/proxy.go 2026-03-05 11:39:22.619163709 +0800
|
--- a/constant/proxy.go
|
||||||
+++ /data/projects/arknights/omv-dijiang/works/core/constant/proxy.go 2026-03-05 13:11:43.857690519 +0800
|
+++ b/constant/proxy.go
|
||||||
@@ -31,6 +31,7 @@
|
@@ -31,6 +31,7 @@
|
||||||
TypeCCM = "ccm"
|
TypeCCM = "ccm"
|
||||||
TypeOCM = "ocm"
|
TypeOCM = "ocm"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
--- /data/projects/arknights/omv-dijiang/works/sing-box/go.mod 2026-03-05 12:48:33.529768921 +0800
|
--- a/go.mod
|
||||||
+++ /data/projects/arknights/omv-dijiang/works/core/go.mod 2026-03-05 13:02:19.454323175 +0800
|
+++ b/go.mod
|
||||||
@@ -11,6 +11,7 @@
|
@@ -11,6 +11,7 @@
|
||||||
github.com/database64128/tfo-go/v2 v2.3.2
|
github.com/database64128/tfo-go/v2 v2.3.2
|
||||||
github.com/go-chi/chi/v5 v5.2.5
|
github.com/go-chi/chi/v5 v5.2.5
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
--- /data/projects/arknights/omv-dijiang/works/sing-box/go.sum 2026-03-05 12:48:33.529768921 +0800
|
--- a/go.sum
|
||||||
+++ /data/projects/arknights/omv-dijiang/works/core/go.sum 2026-03-05 13:02:19.455279219 +0800
|
+++ b/go.sum
|
||||||
@@ -14,6 +14,7 @@
|
@@ -14,6 +14,7 @@
|
||||||
github.com/anthropics/anthropic-sdk-go v1.26.0/go.mod h1:qUKmaW+uuPB64iy1l+4kOSvaLqPXnHTTBKH6RVZ7q5Q=
|
github.com/anthropics/anthropic-sdk-go v1.26.0/go.mod h1:qUKmaW+uuPB64iy1l+4kOSvaLqPXnHTTBKH6RVZ7q5Q=
|
||||||
github.com/anytls/sing-anytls v0.0.11 h1:w8e9Uj1oP3m4zxkyZDewPk0EcQbvVxb7Nn+rapEx4fc=
|
github.com/anytls/sing-anytls v0.0.11 h1:w8e9Uj1oP3m4zxkyZDewPk0EcQbvVxb7Nn+rapEx4fc=
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
--- /data/projects/arknights/omv-dijiang/works/sing-box/include/registry.go 2026-03-05 12:48:33.529768921 +0800
|
--- a/include/registry.go
|
||||||
+++ /data/projects/arknights/omv-dijiang/works/core/include/registry.go 2026-03-05 13:14:06.319924033 +0800
|
+++ b/include/registry.go
|
||||||
@@ -23,6 +23,7 @@
|
@@ -23,6 +23,7 @@
|
||||||
"github.com/sagernet/sing-box/protocol/group"
|
"github.com/sagernet/sing-box/protocol/group"
|
||||||
"github.com/sagernet/sing-box/protocol/http"
|
"github.com/sagernet/sing-box/protocol/http"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
--- /data/projects/arknights/omv-dijiang/works/sing-box/option/group.go 2026-03-05 11:39:22.629561767 +0800
|
--- a/option/group.go
|
||||||
+++ /data/projects/arknights/omv-dijiang/works/core/option/group.go 2026-03-05 13:14:27.190665236 +0800
|
+++ b/option/group.go
|
||||||
@@ -10,6 +10,7 @@
|
@@ -10,6 +10,7 @@
|
||||||
|
|
||||||
type URLTestOutboundOptions struct {
|
type URLTestOutboundOptions struct {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
--- /dev/null 2026-03-05 11:06:53.990718185 +0800
|
--- /dev/null
|
||||||
+++ /data/projects/arknights/omv-dijiang/works/core/option/mysql.go 2026-03-05 13:14:38.655523071 +0800
|
+++ b/option/mysql.go
|
||||||
@@ -0,0 +1,23 @@
|
@@ -0,0 +1,23 @@
|
||||||
+// OMV
|
+// OMV
|
||||||
+package option
|
+package option
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
--- /data/projects/arknights/omv-dijiang/works/sing-box/protocol/group/urltest.go 2026-03-05 11:39:22.630699577 +0800
|
--- a/protocol/group/urltest.go
|
||||||
+++ /data/projects/arknights/omv-dijiang/works/core/protocol/group/urltest.go 2026-03-05 13:17:32.300369913 +0800
|
+++ b/protocol/group/urltest.go
|
||||||
@@ -39,6 +39,7 @@
|
@@ -39,6 +39,7 @@
|
||||||
connection adapter.ConnectionManager
|
connection adapter.ConnectionManager
|
||||||
logger log.ContextLogger
|
logger log.ContextLogger
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
--- /dev/null 2026-03-05 11:06:53.990718185 +0800
|
--- /dev/null
|
||||||
+++ /data/projects/arknights/omv-dijiang/works/core/protocol/mysql/inbound.go 2026-03-05 13:14:59.956258942 +0800
|
+++ b/protocol/mysql/inbound.go
|
||||||
@@ -0,0 +1,255 @@
|
@@ -0,0 +1,255 @@
|
||||||
+// OMV
|
+// OMV
|
||||||
+package mysql
|
+package mysql
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
--- /dev/null 2026-03-05 11:06:53.990718185 +0800
|
--- /dev/null
|
||||||
+++ /data/projects/arknights/omv-dijiang/works/core/protocol/mysql/outbound.go 2026-03-05 13:15:28.015911006 +0800
|
+++ b/protocol/mysql/outbound.go
|
||||||
@@ -0,0 +1,296 @@
|
@@ -0,0 +1,296 @@
|
||||||
+// OMV
|
+// OMV
|
||||||
+package mysql
|
+package mysql
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
--- /data/projects/arknights/omv-dijiang/works/sing-box/route/route.go 2026-03-05 12:48:33.530768910 +0800
|
--- a/route/route.go
|
||||||
+++ /data/projects/arknights/omv-dijiang/works/core/route/route.go 2026-03-05 13:21:58.162073283 +0800
|
+++ b/route/route.go
|
||||||
@@ -421,19 +421,19 @@
|
@@ -421,19 +421,19 @@
|
||||||
} else {
|
} else {
|
||||||
if processInfo.ProcessPath != "" {
|
if processInfo.ProcessPath != "" {
|
||||||
|
|||||||
Reference in New Issue
Block a user