diff options
| author | 2021-01-03 13:09:41 -0600 | |
|---|---|---|
| committer | 2021-01-03 13:09:41 -0600 | |
| commit | ecc6eb749720fefcfb532799aaf95aaeba254b94 (patch) | |
| tree | 40fd51446bb2dff7e7e5c206a66914869dc07400 /jpm | |
| parent | Don't print to stderr in Makefile to detect version. Fix #544 (diff) | |
Don't fail jpm if os/realpath fails.
Diffstat (limited to 'jpm')
| -rwxr-xr-x | jpm | 21 |
1 files changed, 19 insertions, 2 deletions
@@ -22,6 +22,19 @@ ###START### # Overriden on some installs. +# To configure this script, replace the code between +# the START and END comments and define a function +# (install-paths) that gives the the default paths +# to use. Trailing directory separator not expected. +# +# Example. +# +# (defn- install-paths [] +# {:headerpath "/usr/local/include/janet" +# :libpath "/usr/local/lib/janet" +# :binpath "/usr/local/bin" +# + (def- exe-dir "Directory containing jpm script" (do @@ -29,9 +42,13 @@ (def i (last (string/find-all sep exe))) (slice exe 0 i))) +(defn- try-real [path] + "If os/realpath fails just use normal path." + (try (os/realpath) ([_] path))) + (defn- install-paths [] - {:headerpath (os/realpath (string exe-dir "/../include/janet")) - :libpath (os/realpath (string exe-dir "/../lib")) + {:headerpath (try-real (string exe-dir "/../include/janet")) + :libpath (try-real (string exe-dir "/../lib")) :binpath exe-dir}) ###END### |
