Merge branch 'master' of https://github.com/mudssky/powershellScripts

mudssky · mudssky · commit 218ee0328e68 · 2025-06-28T14:31:21.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,6 @@ docker_data/
 
 # pester配置文件
 coverage.xml
-testResults.xml
+testResults.xml
+# 加载环境变量
+env.ps1
diff --git a/profile/profile.ps1 b/profile/profile.ps1
@@ -14,6 +14,10 @@ if (Test-Path -Path "$PSScriptRoot\enableProxy") {
 }
 
 
+if(Test-Path -Path "$PSScriptRoot/env.ps1"){
+	. $PSScriptRoot/env.ps1
+}
+	
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,10 @@ if (Test-Path -Path "$PSScriptRoot\enableProxy") {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`
	`17`	`+if(Test-Path -Path "$PSScriptRoot/env.ps1"){`
	`18`	`+ . $PSScriptRoot/env.ps1`
	`19`	`+}`
	`20`	`+`
`17`	`21`
`18`	`22`
`19`	`23`