From 094d9ba564c4832bc003fbdad47f6c8fd7fd98f7 Mon Sep 17 00:00:00 2001 From: Andrei Jiroh Eugenio Halili Date: Mon, 21 Feb 2022 14:59:40 +0000 Subject: [PATCH] Update gcloud Shell bashrcs Signed-off-by: Andrei Jiroh Eugenio Halili --- bashrc/google.bashrc | 6 +++--- bashrc/googlecloudshell.bashrc | 15 ++++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/bashrc/google.bashrc b/bashrc/google.bashrc index f14475b..3bcfae9 100644 --- a/bashrc/google.bashrc +++ b/bashrc/google.bashrc @@ -16,9 +16,9 @@ # Avoid sourcing bashrc.google more than once for a session as some of # the commands below are not reentrant. -if [[ -n "${GOOGLE_BASHRC_SOURCED}" ]]; then - return -fi +#if [[ -n "${GOOGLE_BASHRC_SOURCED}" ]]; then +# return +#fi GOOGLE_BASHRC_SOURCED=1 START_TIME=$(date +%s%3N) diff --git a/bashrc/googlecloudshell.bashrc b/bashrc/googlecloudshell.bashrc index e9b7b37..ebe4f68 100644 --- a/bashrc/googlecloudshell.bashrc +++ b/bashrc/googlecloudshell.bashrc @@ -4,10 +4,10 @@ # for examples # If not running interactively, don't do anything -case $- in - *i*) ;; - *) return;; -esac +#case $- in +# *i*) ;; +# *) return;; +#esac # don't put duplicate lines or lines starting with space in the history. # See bash(1) for more options @@ -110,9 +110,9 @@ fi export LD_LIBRARY_PATH=/usr/local/lib # After all of these, source my customized Google Cloud Shell bahsrc. -if [ -f "/google/devshell/bashrc.google" ]; then - source "$HOME/.dotfiles/bashrc/google.bashrc" -fi +#if [ -f "/google/devshell/bashrc.google" ]; then +# source "$HOME/.dotfiles/bashrc/google.bashrc" +#fi # Instead of using Google Cloud Shell's preinstalled nvm, I manually installed it on my home directory. export NVM_DIR="$HOME/.nvm" @@ -150,3 +150,4 @@ eval $(gpg-agent --daemon) >> /dev/null 2>&1 # We still need this, just in case gpg-agent is being a dick source $DOTFILES_STUFF_BIN/source-ssh-agent export GPG_TTY=$(tty) +eval "$(direnv hook bash)" \ No newline at end of file