зеркало из https://github.com/microsoft/cobalt.git
Erperall/bugfix/fixes for zsh (#138)
* Altered scripts to work on OSX * Moved YAML template file to root * Test * Revert * Removed YAML file from root * Removed caching from docker build command * Removed YAML file from root * Removed bash profile check/load and replaced it with a variable that references the gnu-getopt installation location if it exists. If not, it will get picked up after the user is prompted for and installs gnu-getopt. * Removed bash profile check/load and replaced it with a variable that references the gnu-getopt installation location if it exists. If not, it will get picked up after the user is prompted for and installs gnu-getopt. * Removed echoing the getopt install location into the bash_profile. This is no longer needed now that gnu-getopt is being forced by the export at the top of the file. * Removed the explicit export that checks for gnu-getopt installation * Removed export that I missed initially
This commit is contained in:
Родитель
a5a5707290
Коммит
82ed42f150
|
@ -1,8 +1,9 @@
|
|||
#!/bin/bash
|
||||
#!/usr/bin/env bash
|
||||
#---------- see https://github.com/joelong01/BashWizard ----------------
|
||||
# bashWizard version 1.0.0
|
||||
# this will make the error text stand out in red - if you are looking at these errors/warnings in the log file
|
||||
# you can use cat <logFile> to see the text in color.
|
||||
|
||||
function echoError() {
|
||||
RED=$(tput setaf 1)
|
||||
NORMAL=$(tput sgr0)
|
||||
|
@ -23,6 +24,7 @@ function echoIfVerbose() {
|
|||
echo "${@}"
|
||||
fi
|
||||
}
|
||||
|
||||
# make sure this version of *nix supports the right getopt
|
||||
! getopt --test 2>/dev/null
|
||||
if [[ ${PIPESTATUS[0]} -ne 4 ]]; then
|
||||
|
@ -33,9 +35,10 @@ if [[ ${PIPESTATUS[0]} -ne 4 ]]; then
|
|||
brew install gnu-getopt
|
||||
#shellcheck disable=SC2016
|
||||
echo 'export PATH="/usr/local/opt/gnu-getopt/bin:$PATH"' >> ~/.bash_profile
|
||||
echoWarning "you'll need to restart the shell instance to load the new path"
|
||||
exec bash -l -i -- $0 "${@}"
|
||||
fi
|
||||
exit 1
|
||||
echo "exiting..."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
function usage() {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/bash
|
||||
#!/usr/bin/env bash
|
||||
#---------- see https://github.com/joelong01/BashWizard ----------------
|
||||
# bashWizard version 1.0.0
|
||||
# this will make the error text stand out in red - if you are looking at these errors/warnings in the log file
|
||||
|
@ -16,9 +16,10 @@ if [[ ${PIPESTATUS[0]} -ne 4 ]]; then
|
|||
brew install gnu-getopt
|
||||
#shellcheck disable=SC2016
|
||||
echo 'export PATH="/usr/local/opt/gnu-getopt/bin:$PATH"' >> ~/.bash_profile
|
||||
echoWarning "you'll need to restart the shell instance to load the new path"
|
||||
exec bash -l -i -- $0 "${@}"
|
||||
fi
|
||||
exit 1
|
||||
echo "exiting..."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
function usage() {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/bash
|
||||
#!/usr/bin/env bash
|
||||
#---------- see https://github.com/joelong01/BashWizard ----------------
|
||||
# bashWizard version 1.0.0
|
||||
# this will make the error text stand out in red - if you are looking at these errors/warnings in the log file
|
||||
|
@ -16,9 +16,10 @@ if [[ ${PIPESTATUS[0]} -ne 4 ]]; then
|
|||
brew install gnu-getopt
|
||||
#shellcheck disable=SC2016
|
||||
echo 'export PATH="/usr/local/opt/gnu-getopt/bin:$PATH"' >> ~/.bash_profile
|
||||
echoWarning "you'll need to restart the shell instance to load the new path"
|
||||
exec bash -l -i -- $0 "${@}"
|
||||
fi
|
||||
exit 1
|
||||
echo "exiting..."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
function usage() {
|
||||
|
|
Загрузка…
Ссылка в новой задаче