Skip to content

Commit

Permalink
Merge pull request kubernetes#31609 from rhcarvalho/fix-bash
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

Fix Bash script

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md
2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md
3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes
-->

**What this PR does / why we need it**: `cluster/mesos/docker/socat/build.sh` had two lines mixed together.

Old command output:

```
$ ./cluster/mesos/docker/socat/build.sh 
./cluster/mesos/docker/socat/build.sh: line 21: set: pipefailscript_dir=/home/rodolfo/src/k8s.io/kubernetes/cluster/mesos/docker/socat: invalid option name
```

**Special notes for your reviewer**: probably nobody is using that script? @sttts PTAL.

**Release note**:
<!--  Steps to write your release note:
1. Use the release-note-* labels to set the release note state (if you have access) 
2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. 
-->
```release-note
NONE
```
  • Loading branch information
Kubernetes Submit Queue authored Sep 6, 2016
2 parents 06b6fb5 + e24745d commit af8124c
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion cluster/mesos/docker/socat/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@

set -o errexit
set -o nounset
set -o pipefailscript_dir=$(cd $(dirname "${BASH_SOURCE}") && pwd -P)
set -o pipefail

script_dir=$(cd $(dirname "${BASH_SOURCE}") && pwd -P)

cd "${script_dir}"

Expand Down

0 comments on commit af8124c

Please sign in to comment.