From 03903d3e75fb54d0d00a2a08d0896b8b6ee5cff7 Mon Sep 17 00:00:00 2001 From: Wryn Wagner Date: Mon, 1 Mar 2021 14:48:57 -0700 Subject: [PATCH] Use defined webbrowser command --- env/env | 5 ++++- zsh/rentdynamics | 5 ++--- zsh/utility | 5 ++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/env/env b/env/env index 1c82768..bfa981c 100755 --- a/env/env +++ b/env/env @@ -10,4 +10,7 @@ WALLPAPER_PATH="$HOME/Pictures/bg" PREFERRED_EDITOR=(vi vim) # plays audio files located throughout the system -MEDIA_ENGINE="canberra-gtk-play -f" +MEDIA_ENGINE='canberra-gtk-play -f' + +# default applications +WEBBROWSER='google-chrome-stable' diff --git a/zsh/rentdynamics b/zsh/rentdynamics index ca824c5..344101d 100644 --- a/zsh/rentdynamics +++ b/zsh/rentdynamics @@ -53,13 +53,12 @@ function rnt() { *) deactivate >/dev/null 2>/dev/null || deactivate_node >/dev/null 2>/dev/null; cd "$RD_PATH" - source "$RD_PATH/ENV.sh" [ -d "$1" ] && { cd "$1" >/dev/null 2>/dev/null; [ -f "./env/bin/activate" ] \ && source "./env/bin/activate" \ - || echo 'No environment here, boss!'; + || echo 'No virtual environment here, boss!'; [ -f "./myenv" ] \ && source "./myenv" \ && echo 'Loaded custom environment settings!'; @@ -121,7 +120,7 @@ function RENT_DYNAMICS_GIT_PROJECT_CLEAN_UP() { } function RENT_DYNAMICS_CONNECT_TO_EMAIL() { - xdg-open https://mail.google.com/mail/u/1; + $WEBBROWSER https://mail.google.com/mail/u/1; } function RENT_DYNAMICS_UPDATE_SLACK_STATUS() { diff --git a/zsh/utility b/zsh/utility index ceedc85..95d538e 100644 --- a/zsh/utility +++ b/zsh/utility @@ -34,7 +34,10 @@ OPEN_CURRENT_GIT_REPOSITORY_IN_WEB_BROWSER() { return 1; } local URL="$(git remote get-url $REMOTE | sed 's/git@\([^:]*\):/http:\/\/\1\//')" - xdg-open $URL; + [ "$WEBBROWSER" ]\ + && "$WEBBROWSER $URL" >/dev/null 2>&1 \ + || dg-open $URL >/dev/null 2>&1 \ + || echo $URL; }