diff options
| author | Ângelo Andrade Cirino <[email protected]> | 2022-01-17 10:56:56 -0300 |
|---|---|---|
| committer | Ângelo Andrade Cirino <[email protected]> | 2022-01-17 10:56:56 -0300 |
| commit | 92978c6f56ab66e17e19776d2e35832fa8be6e97 (patch) | |
| tree | 8156c9043b20682df56ee30f673ac84a2c042eeb /xmake/modules/net/proxy.lua | |
| parent | 274244bf3530a77ab3c93309e5ea5bb5d29907ae (diff) | |
| parent | b86e3b25723812bdf0c20bc1d3d4075d47b57523 (diff) | |
Merge branch 'master' of https://github.com/xmake-io/xmake into modnamefix
Diffstat (limited to 'xmake/modules/net/proxy.lua')
| -rw-r--r-- | xmake/modules/net/proxy.lua | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xmake/modules/net/proxy.lua b/xmake/modules/net/proxy.lua index 6aac4af4c..809b28352 100644 --- a/xmake/modules/net/proxy.lua +++ b/xmake/modules/net/proxy.lua @@ -60,6 +60,9 @@ function _proxy_pac() end if not pacfile and not path.is_absolute(pac) then pacfile = path.join(global.directory(), pac) + if not os.isfile(pacfile) and os.isfile(path.join(os.programdir(), "scripts", "pac", pac)) then + pacfile = path.join(os.programdir(), "scripts", "pac", pac) + end end end if pacfile and os.isfile(pacfile) then |
