diff --git a/ci/release/_install.sh b/ci/release/_install.sh index d00a9c330..3db966133 100755 --- a/ci/release/_install.sh +++ b/ci/release/_install.sh @@ -185,12 +185,22 @@ install() { if ! echo "$PATH" | grep -qF "$PREFIX/bin"; then logcat >&2 <&2 <./install.sh <\> ./install.sh sh_c cat ./ci/release/_install.sh \ \| sed -n "'/cd -- \"\$(dirname/,/cd -/!p'" \>\> install.sh +chmod -w install.sh diff --git a/ci/release/template/scripts/install.sh b/ci/release/template/scripts/install.sh index 454cbca98..4b4ae2d08 100755 --- a/ci/release/template/scripts/install.sh +++ b/ci/release/template/scripts/install.sh @@ -9,7 +9,8 @@ main() { return 1 fi - sh_c mkdir -p "$PREFIX" + sh_c mkdir -p "$PREFIX/bin" + sh_c mkdir -p "$PREFIX/share/man/man1" sh_c install ./bin/d2 "$PREFIX/bin/d2" sh_c install ./man/d2.1 "$PREFIX/share/man/man1" } diff --git a/ci/sub b/ci/sub index 9efc8337b..db0f04530 160000 --- a/ci/sub +++ b/ci/sub @@ -1 +1 @@ -Subproject commit 9efc8337b86eaebf0fbc9b4c2202f1bdcf156a7d +Subproject commit db0f045304ba1d69b85043d02c76891b75be6f0e diff --git a/install.sh b/install.sh index e32450f48..77a8f8151 100755 --- a/install.sh +++ b/install.sh @@ -423,6 +423,16 @@ arch() { gh_repo() { gh repo view --json nameWithOwner --template '{{ .nameWithOwner }}' } + +manpath() { + if command -v manpath >/dev/null; then + command manpath + elif man -w 2>/dev/null; then + man -w + else + echo "${MANPATH-}" + fi +} #!/bin/sh set -eu @@ -605,12 +615,22 @@ install() { if ! echo "$PATH" | grep -qF "$PREFIX/bin"; then logcat >&2 <&2 <