about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2023-10-04 17:46:35 +0000
committerEric Wong <e@80x24.org>2023-10-04 22:58:22 +0000
commit14dd9df0f718f8d0815851efe52f3633ec6137b8 (patch)
tree9745ef7745c05a0888e466c656db9037b8ab27c4
parent8fe9ff206dfc868882d8382f9b718868e2660330 (diff)
downloadpublic-inbox-14dd9df0f718f8d0815851efe52f3633ec6137b8.tar.gz
For the Makefile, we can use $(PWD) make macro from make(1posix)
as POSIX requires all environment variables be accessible as
macros, and $PWD is a standard sh(1) environment variable.

lei.sh must quiet the stderr of realpath before falling back to
readlink(1) which is available on NetBSD.
-rw-r--r--Makefile.PL2
-rwxr-xr-xlei.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.PL b/Makefile.PL
index 8bd39e6c..38e030f5 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -264,7 +264,7 @@ prefix = \$(HOME)
 bindir = \$(prefix)/bin
 symlink-install : lib/PublicInbox.pm
         mkdir -p \$(bindir)
-        lei=\$\$(realpath lei.sh) && cd \$(bindir) && \\
+        lei="\$(PWD)/lei.sh" && cd \$(bindir) && \\
         for x in \$(EXE_FILES); do \\
                 ln -sf "\$\$lei" \$\$(basename "\$\$x"); \\
         done
diff --git a/lei.sh b/lei.sh
index f1510a73..afb03f3e 100755
--- a/lei.sh
+++ b/lei.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 # symlink this file to a directory in PATH to run lei (or anything in script/*)
 # without needing perms to install globally.  Used by "make symlink-install"
-p=$(realpath "$0" || readlink "$0") # neither is POSIX, but common
+p=$(realpath "$0" 2>/dev/null || readlink "$0") # neither is POSIX, but common
 p=$(dirname "$p") c=$(basename "$0") # both are POSIX
 exec ${PERL-perl} -w -I"$p"/lib "$p"/script/"${c%.sh}" "$@"
 : this script is too short to copyright