diff --git a/script/install.sh b/script/install.sh index 388d73e6..3fa4482f 100755 --- a/script/install.sh +++ b/script/install.sh @@ -371,6 +371,10 @@ run_command() { install_dub fi + if [[ $2 = dmd* ]]; then + manpath=man + fi + write_env_vars "$2" if [ "$(basename "$SHELL")" = fish ]; then @@ -381,7 +385,7 @@ run_command() { else log " Run \`source $ROOT/$2/activate${suffix:-}\` in your shell to use $2. -This will setup PATH, LIBRARY_PATH, LD_LIBRARY_PATH, DMD, DC, and PS1. +This will setup PATH, LIBRARY_PATH, LD_LIBRARY_PATH, ${manpath+MANPATH, }DMD, DC, and PS1. Run \`deactivate\` later on to restore your environment." fi ;; @@ -710,17 +714,19 @@ write_env_vars() { esac logV "Writing environment variables to $ROOT/$1/activate" - cat > "$ROOT/$1/activate" < "$ROOT/$1/activate" < "$ROOT/$1/activate.fish" < "$ROOT/$1/activate.fish" </dev/null 2>&1 || { echo >&2 "DUB hasn't been installed."; exit 1; } deactivate + # Check man pages do not destroy system man pages availability + if [[ $compiler = dmd* ]]; then + . ~/dlang/$compiler/activate + man dmd >/dev/null 2>&1 + deactivate + fi + ./script/install.sh uninstall $compiler done