Skip to content

Commit f33f05a

Browse files
tijcolemtijcolem
committed
prefix the new envs as UO_ as these are just for the UO installer only and not for ruby
1 parent adf47d0 commit f33f05a

4 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎scripts/setup-env-gitbash.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ UO_DIR_NAME=$(basename "$BASE_DIR_NAME")
1313

1414
GEM_HOME=${BASE_DIR_NAME}/gems/ruby/${RUBY_BASE_VERSION}
1515
GEM_PATH=${BASE_DIR_NAME}/gems/ruby/${RUBY_BASE_VERSION}
16-
GEMFILE_PATH=${BASE_DIR_NAME}/gems/Gemfile
17-
BUNDLE_INSTALL_PATH=${BASE_DIR_NAME}/gems
16+
UO_GEMFILE_PATH=${BASE_DIR_NAME}/gems/Gemfile
17+
UO_BUNDLE_INSTALL_PATH=${BASE_DIR_NAME}/gems
1818
PATH=${BASE_DIR_NAME}/ruby/bin:${BASE_DIR_NAME}/gems/ruby/${RUBY_BASE_VERSION}/bin:${BASE_DIR_NAME}/gems/ruby/${RUBY_BASE_VERSION}/gems/${UO_DIR_NAME}/example_files/python_deps/Miniconda-${MINICONDA_VERSION}/bin:$PATH
1919
RUBYLIB=${BASE_DIR_NAME}/OpenStudio/Ruby
2020
RUBY_DLL_PATH=${BASE_DIR_NAME}/OpenStudio/Ruby
@@ -27,8 +27,8 @@ fi
2727

2828
echo "export GEM_HOME=\"${GEM_HOME}\"" >> ~/.env_uo.sh
2929
echo "export GEM_PATH=\"${GEM_PATH}\"" >> ~/.env_uo.sh
30-
echo "export GEMFILE_PATH=\"${GEMFILE_PATH}\"" >> ~/.env_uo.sh
31-
echo "export BUNDLE_INSTALL_PATH=\"${BUNDLE_INSTALL_PATH}\"" >> ~/.env_uo.sh
30+
echo "export UO_GEMFILE_PATH=\"${UO_GEMFILE_PATH}\"" >> ~/.env_uo.sh
31+
echo "export UO_BUNDLE_INSTALL_PATH=\"${UO_BUNDLE_INSTALL_PATH}\"" >> ~/.env_uo.sh
3232
echo "export PATH=\"${PATH}\"" >> ~/.env_uo.sh
3333
echo "export RUBYLIB=\"${RUBYLIB}\"" >> ~/.env_uo.sh
3434
echo "export RUBY_DLL_PATH=\"${RUBY_DLL_PATH}\"" >> ~/.env_uo.sh

‎scripts/setup-env-unix.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ UO_DIR_NAME=$(basename "$UO_DIR")
1212

1313
GEM_HOME=${UO_DIR}/gems/ruby/${RUBY_BASE_VERSION}
1414
GEM_PATH=${UO_DIR}/gems/ruby/${RUBY_BASE_VERSION}
15-
GEMFILE_PATH=${UO_DIR}/gems/Gemfile
16-
BUNDLE_INSTALL_PATH=${UO_DIR}/gems
15+
UO_GEMFILE_PATH=${UO_DIR}/gems/Gemfile
16+
UO_BUNDLE_INSTALL_PATH=${UO_DIR}/gems
1717
PATH=${UO_DIR}/ruby/bin:${UO_DIR}/gems/ruby/${RUBY_BASE_VERSION}/bin:${UO_DIR}/gems/ruby/${RUBY_BASE_VERSION}/gems/${UO_DIR_NAME}/example_files/python_deps/Miniconda-${MINICONDA_VERSION}/bin:$PATH
1818
RUBYLIB=${UO_DIR}/OpenStudio/Ruby
1919
RUBY_DLL_PATH=${UO_DIR}/OpenStudio/Ruby
@@ -25,8 +25,8 @@ fi
2525

2626
echo "export GEM_HOME=\"${GEM_HOME}\"" >> ~/.env_uo.sh
2727
echo "export GEM_PATH=\"${GEM_PATH}\"" >> ~/.env_uo.sh
28-
echo "export GEMFILE_PATH=\"${GEMFILE_PATH}\"" >> ~/.env_uo.sh
29-
echo "export BUNDLE_INSTALL_PATH=\"${BUNDLE_INSTALL_PATH}\"" >> ~/.env_uo.sh
28+
echo "export UO_GEMFILE_PATH=\"${UO_GEMFILE_PATH}\"" >> ~/.env_uo.sh
29+
echo "export UO_BUNDLE_INSTALL_PATH=\"${UO_BUNDLE_INSTALL_PATH}\"" >> ~/.env_uo.sh
3030
echo "export PATH=\"${PATH}\"" >> ~/.env_uo.sh
3131
echo "export RUBYLIB=\"${RUBYLIB}\"" >> ~/.env_uo.sh
3232
echo "export RUBY_DLL_PATH=\"${RUBY_DLL_PATH}\"" >> ~/.env_uo.sh

‎scripts/setup-env.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ SET BASE_DIR_NAME=%~d0%~p0
77

88
SET GEM_HOME=%BASE_DIR_NAME%\gems\ruby\%RUBY_BASE_VERSION%
99
SET GEM_PATH=%BASE_DIR_NAME%\gems\ruby\%RUBY_BASE_VERSION%
10-
SET GEMFILE_PATH=%UO_DIR%\gems\Gemfile
11-
SET BUNDLE_INSTALL_PATH=%UO_DIR%\gems
10+
SET UO_GEMFILE_PATH=%UO_DIR%\gems\Gemfile
11+
SET UO_BUNDLE_INSTALL_PATH=%UO_DIR%\gems
1212
SET PATH=%BASE_DIR_NAME%\ruby\bin;%BASE_DIR_NAME%\gems\ruby\%RUBY_BASE_VERSION%\bin;%PATH%
1313
SET RUBYLIB=%BASE_DIR_NAME%\OpenStudio\Ruby
1414
SET RUBY_DLL_PATH=%BASE_DIR_NAME%\OpenStudio\Ruby
@@ -22,8 +22,8 @@ IF EXIST %HOMEPATH%\.env_uo.bat (
2222

2323
echo SET "GEM_HOME=%GEM_HOME%">> "%HOMEPATH%\.env_uo.bat"
2424
echo SET "GEM_PATH=%GEM_PATH%">> "%HOMEPATH%\.env_uo.bat"
25-
echo SET "GEMFILE_PATH=%GEMFILE_PATH%">> "%HOMEPATH%\.env_uo.bat"
26-
echo SET "BUNDLE_INSTALL_PATH=%BUNDLE_INSTALL_PATH%">> "%HOMEPATH%\.env_uo.bat"
25+
echo SET "UO_GEMFILE_PATH=%UO_GEMFILE_PATH%">> "%HOMEPATH%\.env_uo.bat"
26+
echo SET "UO_BUNDLE_INSTALL_PATH=%UO_BUNDLE_INSTALL_PATH%">> "%HOMEPATH%\.env_uo.bat"
2727
echo SET "PATH=%PATH%">> "%HOMEPATH%\.env_uo.bat"
2828
echo SET "RUBYLIB=%RUBYLIB%">> "%HOMEPATH%\.env_uo.bat"
2929
echo SET "RUBY_DLL_PATH=%RUBY_DLL_PATH%">> "%HOMEPATH%\.env_uo.bat"

‎scripts/setup-env.ps1‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ $BASE_DIR_NAME = $PSScriptRoot
2525

2626
$GEM_HOME = "$BASE_DIR_NAME\gems\ruby\$RUBY_BASE_VERSION"
2727
$GEM_PATH = "$BASE_DIR_NAME\gems\ruby\$RUBY_BASE_VERSION"
28-
$GEMFILE_PATH = "$UO_DIR\gems\Gemfile"
29-
$BUNDLE_INSTALL_PATH = "$UO_DIR\gems"
28+
$UO_GEMFILE_PATH = "$UO_DIR\gems\Gemfile"
29+
$UO_BUNDLE_INSTALL_PATH = "$UO_DIR\gems"
3030
$PATH += ";$BASE_DIR_NAME\ruby\bin;$BASE_DIR_NAME\gems\ruby\$RUBY_BASE_VERSION\bin;$RUBY_PYTHON_PATH;$env::PATH"
3131
$RUBYLIB = "$BASE_DIR_NAME\OpenStudio\Ruby"
3232
$RUBY_DLL_PATH = "$BASE_DIR_NAME\OpenStudio\Ruby"
@@ -37,17 +37,17 @@ Remove-Item $HOME/.env_uo.bat -ErrorAction Ignore
3737

3838
'$env:GEM_HOME = "' + $GEM_HOME + '"' >> $HOME/.env_uo.ps1
3939
'$env:GEM_PATH = "' + $GEM_PATH + '"' >> $HOME/.env_uo.ps1
40-
'$env:GEMFILE_PATH = "' + $GEMFILE_PATH + '"' >> $HOME/.env_uo.ps1
41-
'$env:BUNDLE_INSTALL_PATH = "' + $BUNDLE_INSTALL_PATH + '"' >> $HOME/.env_uo.ps1
40+
'$env:UO_GEMFILE_PATH = "' + $UO_GEMFILE_PATH + '"' >> $HOME/.env_uo.ps1
41+
'$env:UO_BUNDLE_INSTALL_PATH = "' + $UO_BUNDLE_INSTALL_PATH + '"' >> $HOME/.env_uo.ps1
4242
'$env:PATH = "' + $PATH + '"' >> $HOME/.env_uo.ps1
4343
'$env:RUBYLIB = "' + $RUBYLIB + '"' >> $HOME/.env_uo.ps1
4444
'$env:RUBY_DLL_PATH = "' + $RUBY_DLL_PATH + '"' >> $HOME/.env_uo.ps1
4545

4646
'' >> $HOME/.env_uo.bat
4747
'SET "GEM_HOME=' + $GEM_HOME + '"' >> $HOME/.env_uo.bat
4848
'SET "GEM_PATH=' + $GEM_PATH + '"' >> $HOME/.env_uo.bat
49-
'SET "GEMFILE_PATH=' + $GEMFILE_PATH + '"' >> $HOME/.env_uo.bat
50-
'SET "BUNDLE_INSTALL_PATH=' + $BUNDLE_INSTALL_PATH + '"' >> $HOME/.env_uo.bat
49+
'SET "UO_GEMFILE_PATH=' + $UO_GEMFILE_PATH + '"' >> $HOME/.env_uo.bat
50+
'SET "UO_BUNDLE_INSTALL_PATH=' + $UO_BUNDLE_INSTALL_PATH + '"' >> $HOME/.env_uo.bat
5151
'SET "PATH=' + $PATH + '"' >> $HOME/.env_uo.bat
5252
'SET "RUBYLIB=' + $RUBYLIB + '"' >> $HOME/.env_uo.bat
5353
'SET "RUBY_DLL_PATH=' + $RUBY_DLL_PATH + '"' >> $HOME/.env_uo.bat

0 commit comments

Comments
 (0)