From 0f1994f2a007402a98fd23fbae3e9cf8654bc02a Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Mon, 30 Oct 2023 10:41:45 -0400 Subject: [PATCH] More logic --- configs/shells/bash/macros.sh | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/configs/shells/bash/macros.sh b/configs/shells/bash/macros.sh index a560692..7545b2b 100644 --- a/configs/shells/bash/macros.sh +++ b/configs/shells/bash/macros.sh @@ -205,6 +205,12 @@ ewconfig-pull-zip(){ # Pop a shell inside Guru env guru-shell() { + # If //qs does not exist + if [ ! -d "//qs" ]; then + echo "This command must be executed on a studio machine!" + return 1 + fi + # Figure out the appropriate prefix if [ $(uname -o | grep -c Msys) -gt 0 ]; then s_drive="S://" @@ -214,9 +220,20 @@ guru-shell() { pathsep=":" fi - PYTHONPATH="$s_drive/studio/studio2023/env$pathsep$PYTHONPATH" \ - PYTHONPATH="$s_drive/studio/studio2023$pathsep$PYTHONPATH" \ + # Ask if we want to use the development env + echo "Do you want to use the development environment? (Y/n)" + read dev_env + if [ "$dev_env" == "n" ]; then + studio2023_path="studio/studio2023" + ps1_mode="" + else + studio2023_path="development/epratten/studio/studio2023" + ps1_mode="-dev" + fi + + PYTHONPATH="$s_drive/$studio2023_path/env$pathsep$PYTHONPATH" \ + PYTHONPATH="$s_drive/$studio2023_path$pathsep$PYTHONPATH" \ PATH="/c/Programs/software/win/core/python/python_3.7.7$pathsep$PATH" \ - PS1_CTX="guru bash" \ + PS1_CTX="guru$ps1_mode bash" \ bash } \ No newline at end of file