From e3add04591e12ea73349d69759501e37a3615ba2 Mon Sep 17 00:00:00 2001
From: odow <o.dowson@gmail.com>
Date: Fri, 20 Sep 2024 09:59:27 +1200
Subject: [PATCH] Check for license in ${XPRESSDIR}/bin

---
 src/license.jl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/license.jl b/src/license.jl
index 2d5e3f62..c993e6ab 100644
--- a/src/license.jl
+++ b/src/license.jl
@@ -15,10 +15,13 @@ function _get_xpauthpath(xpauth_path = "", verbose::Bool = true)
     # variables.
     for key in ("XPAUTH_PATH", "XPRESSDIR")
         if haskey(ENV, key)
+            path = replace(ENV[key], "\"" => "")
             # With the default filename
-            push!(candidates, joinpath(replace(ENV[key], "\"" => ""), XPAUTH))
+            push!(candidates, joinpath(path, XPAUTH))
+            # in /bin
+            push!(candidates, joinpath(path, "bin", XPAUTH))
             # and without
-            push!(candidates, replace(ENV[key], "\"" => ""))
+            push!(candidates, path)
         end
     end
     # Search in `xpress/lib/../bin/xpauth.xpr`. This is a common location on