Merge pull request #193 from st3v3nhunt/better-deno-install

better deno install

dotfiles/.shared-shell-setup

@@ -17,6 +17,8 @@ export NVM_LAZY_LOAD=true
 # Source zsh-nvm
 source ~/.zsh-nvm/zsh-nvm.plugin.zsh
 
-# Set Deno options
-export DENO_INSTALL="/home/shunt/.deno"
-export PATH="$DENO_INSTALL/bin:$PATH"
+# Add Deno to PATH
+if [[ "$OSTYPE" != "darwin*" ]]; then
+  export DENO_INSTALL="/home/shunt/.deno"
+  export PATH="$DENO_INSTALL/bin:$PATH"
+fi

dotfiles/.zshrc

@@ -112,9 +112,9 @@ export PATH="$PATH:~/.dotnet/tools"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
 
 # PERSONAL SETUP
-. ~/.aliases
-. ~/.functions
-. ~/.shared-shell-setup
+source ~/.aliases
+source ~/.functions
+source ~/.shared-shell-setup
 
 #   -i   case-insensitive search unless search string contains uppercase letters
 #   -R   color
@@ -154,13 +154,13 @@ source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
 
 # tabtab source for packages
 # uninstall by removing these lines
-[[ -f ~/.config/tabtab/__tabtab.zsh ]] && . ~/.config/tabtab/__tabtab.zsh || true
+[[ -f ~/.config/tabtab/__tabtab.zsh ]] && source ~/.config/tabtab/__tabtab.zsh || true
 # zprof
 
 # The next line updates PATH for the Google Cloud SDK.
-if [ -f '/home/shunt/google-cloud-sdk/path.zsh.inc' ]; then . '/home/shunt/google-cloud-sdk/path.zsh.inc'; fi
+if [ -f '/home/shunt/google-cloud-sdk/path.zsh.inc' ]; then source '/home/shunt/google-cloud-sdk/path.zsh.inc'; fi
 
 # The next line enables shell command completion for gcloud.
-if [ -f '/home/shunt/google-cloud-sdk/completion.zsh.inc' ]; then . '/home/shunt/google-cloud-sdk/completion.zsh.inc'; fi
+if [ -f '/home/shunt/google-cloud-sdk/completion.zsh.inc' ]; then source '/home/shunt/google-cloud-sdk/completion.zsh.inc'; fi
 
 export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"

scripts/install-mac-stuff.sh

@@ -14,6 +14,7 @@ printf "${GREEN}Finished installing Karabiner-Elements configuration...${NC}\\n"
 echo "If there are problems with karabiner settings not being loaded try turning on the setting for 'system default configuration'"
 
 brews=(
+deno
 docker-machine-driver-hyperkit
 hyperkit
 reattach-to-user-namespace

scripts/install-node-stuff.sh

@@ -7,25 +7,3 @@ echo "Installing global npm packages (serverless, snyk, yarn)..."
 npm install -g serverless
 npm install -g snyk
 npm install -g yarn
-
-echo "Installing deno and autocompletion..."
-curl -fsSL https://deno.land/x/install/install.sh | sh
-
-if [[ -n "$ZSH" ]]; then
-  # shellcheck disable=1090
-  . ~/.zshrc
-  mkdir ~/.oh-my-zsh/custom/plugins/deno
-  deno completions zsh > ~/.oh-my-zsh/custom/plugins/deno/_deno
-  # shellcheck disable=1090
-  . ~/.zshrc
-else
-  # shellcheck disable=1090
-  . ~/.bashrc
-  if [[ -n "$WSL_DISTRO_NAME" ]]; then
-    deno completions bash > /home/linuxbrew/.linuxbrew/etc/bash_completion.d/deno.bash
-  else
-    deno completions bash > /usr/local/etc/bash_completion.d/deno.bash
-  fi
-  # shellcheck disable=1090
-  . ~/.bashrc
-fi

scripts/install-wsl-stuff.sh

@@ -5,6 +5,25 @@ sudo apt-get install build-essential curl file git zsh vim.gtk
 sudo apt-get install apt-transport-https
 sudo apt-get install dotnet-sdk-3.1
 
+echo "Installing Deno..."
+curl -fsSL https://deno.land/x/install/install.sh | sh
+
+echo "Installing Deno autocompletion..."
+if [[ -n "$ZSH" ]]; then
+  # shellcheck disable=1090
+  source ~/.zshrc
+  mkdir ~/.oh-my-zsh/custom/plugins/deno
+  deno completions zsh > ~/.oh-my-zsh/custom/plugins/deno/_deno
+  # shellcheck disable=1090
+  source ~/.zshrc
+else
+  # shellcheck disable=1090
+  source ~/.bashrc
+    deno completions bash > /home/linuxbrew/.linuxbrew/etc/bash_completion.d/deno.bash
+  # shellcheck disable=1090
+  source ~/.bashrc
+fi
+
 REPO_DIR="$( cd "$( dirname "$(dirname "${BASH_SOURCE[0]}" )" )" && pwd )"
 
 echo "Copying 'wsl.conf' into /etc/. Password will be required"