From bd28456269a17a0809e7ca518e199bb9daad557b Mon Sep 17 00:00:00 2001 From: Nayeem Rahman Date: Wed, 8 Apr 2020 20:17:12 +0100 Subject: [PATCH] Revert "Default DENO_INSTALL to $HOME/.local (#89)" (#106) This reverts commit 654d0ea30950d7540e1dae65e4f9476909cc50fd. --- README.md | 5 ++--- install.sh | 2 +- install_test.sh | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 820846f..bf5bc3c 100644 --- a/README.md +++ b/README.md @@ -84,9 +84,8 @@ scoop reset deno ## Environment Variables - `DENO_INSTALL` - The directory in which to install Deno. This defaults to - `$HOME/.local` on Linux/macOS and `$HOME/.deno` on Windows. The executable - is placed in `$DENO_INSTALL/bin`. One application of this is a system-wide - installation: + `$HOME/.deno`. The executable is placed in `$DENO_INSTALL/bin`. One + application of this is a system-wide installation: **With Shell (`/usr/local`):** diff --git a/install.sh b/install.sh index 316ce1b..9877f4d 100755 --- a/install.sh +++ b/install.sh @@ -26,7 +26,7 @@ else deno_uri="https://github.com/denoland/deno/releases/download/${1}/deno-${target}.zip" fi -deno_install="${DENO_INSTALL:-$HOME/.local}" +deno_install="${DENO_INSTALL:-$HOME/.deno}" bin_dir="$deno_install/bin" exe="$bin_dir/deno" diff --git a/install_test.sh b/install_test.sh index accb885..7e996be 100755 --- a/install_test.sh +++ b/install_test.sh @@ -6,10 +6,10 @@ set -e # TODO(ry) shellcheck -s sh ./*.sh # Test that we can install the latest version at the default location. -rm -f ~/.local/bin/deno +rm -f ~/.deno/bin/deno unset DENO_INSTALL sh ./install.sh -~/.local/bin/deno --version +~/.deno/bin/deno --version # Test that we can install a specific version at a custom location. rm -rf ~/deno-0.38.0