diff --git a/README.md b/README.md index c290d38..bd45312 100644 --- a/README.md +++ b/README.md @@ -203,7 +203,7 @@ To start/stop/restart Oracle run the following commands: ``` ## APEX -To connect to APEX go to `http:///` or `https:///` and it will direct you to the APEX login page. +Typically, to connect to APEX from host go to `http://:/` or `https://:/` and it will direct you to the APEX login page. Please check [Vagrant Port Mapping](#vagrant-port-mapping) for host port. Workspace | Username | Password | Description ------ | ------ | ------ | ------ diff --git a/Vagrantfile b/Vagrantfile index 06e9e5f..95a1ffc 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -90,6 +90,9 @@ Vagrant.configure(2) do |config| config.vm.provision "shell", inline: <<-SHELL export OOS_DEPLOY_TYPE="VAGRANT" + #226: fix DNS related error with vagrant build + echo "nameserver 8.8.8.8" >> /etc/resolv.conf + if [ -n "$(command -v yum)" ]; then echo; echo \* Installing rsync with yum \* yum install rsync -y diff --git a/build.sh b/build.sh index c282e97..18a6b6e 100755 --- a/build.sh +++ b/build.sh @@ -119,8 +119,9 @@ fi #Install ratom +#228: fix unhandled 'which' stderror prompt during vagrant build . ${OOS_UTILS_DIR}/echo_title.sh "Installing ratom" -if [ "$(which ratom)" == "" ]; then +if [ "$(which ratom 2> /dev/null)" == "" ]; then cd $OOS_SOURCE_DIR eval "source ./scripts/ratom.sh $OOS_LOG_OPTIONS" else diff --git a/scripts/packages.sh b/scripts/packages.sh index fb3ab50..9462237 100644 --- a/scripts/packages.sh +++ b/scripts/packages.sh @@ -103,8 +103,9 @@ if [ "$OOS_MODULE_NODEJS" = "Y" ]; then # fi #13: Bower support (since node.js will be installed by default) + #228: fix unhandled 'which' stderror prompt during vagrant build echo; echo \* Installing Bower \*; echo - if [ "$(which bower)" == "" ]; then + if [ "$(which bower 2> /dev/null)" == "" ]; then npm install -g bower else echo bower already installed diff --git a/utils/download.sh b/utils/download.sh index 06fbfe5..26ee3f6 100755 --- a/utils/download.sh +++ b/utils/download.sh @@ -16,7 +16,8 @@ fi # Adapted from: http://stackoverflow.com/questions/12451278/bash-capture-stdout-to-a-variable-but-still-display-it-in-the-console echo "Requesting to download file ${download_path}" #127: Added -L option to help assist with dropbox.com links. -DOWNLOAD_OUTPUT=$(curl -L -O -C - ${download_path} --progress-bar 2> >(tee /dev/tty)) +#227: fix tee /dev/tty error +DOWNLOAD_OUTPUT=$(curl -L -O -C - ${download_path} --progress-bar 2> >(tee ${OOS_ERROR_LOG} --append)) exit_code=$? if [[ $exit_code = 0 ]]; then