Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

assorted trivial fixes and style cleanups #41

Merged
merged 13 commits into from Apr 17, 2017

Conversation

jhoblitt
Copy link
Member

Split out of #37

@jhoblitt jhoblitt requested review from timj and athornton April 13, 2017 19:57
Copy link

@athornton athornton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

YAY accommodation for those of us who know that 80 columns is enough!

One other thing. == is a bashism, and = is POSIX. The shebang says you're using bash, so that's fine, except then I think the file should be called newinstall.bash but then that would break a lot of stuff, I bet.

@timj
Copy link
Member

timj commented Apr 13, 2017

I think the instructions tell people to run it as bash newinstall.sh 😄

Copy link
Member

@timj timj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for sorting out the tabs.

@jhoblitt
Copy link
Member Author

@athornton == is indeed a bashism but note that we're also using [[ ]], which isn't POSIX either.

@jhoblitt jhoblitt force-pushed the tickets/DM-9526-pkgroot-cleanups branch from 567f278 to 2cd1f8f Compare April 13, 2017 20:23
@jhoblitt
Copy link
Member Author

I've tacked on some fixes to the "up2date" check so it does give an ugly error message when piping the script into the shell. I'll wait for CI to pass again before merging.

@jhoblitt
Copy link
Member Author

@athornton Brings up a good point about 80 cols. That has been irritating me too. I will add a reformatting commit.

@jhoblitt
Copy link
Member Author

The "80cols" changeset gets almost every line <= 80 cols with a tabstop of 2.

@jhoblitt jhoblitt force-pushed the tickets/DM-9526-pkgroot-cleanups branch 3 times, most recently from 7d924e1 to 51b5259 Compare April 17, 2017 17:45
@jhoblitt jhoblitt force-pushed the tickets/DM-9526-pkgroot-cleanups branch from 932e90a to 6e02795 Compare April 17, 2017 18:07
Note that this is intentionally optimizing the script for editability
rather than consistent line wrapping length for output.
The presence of these characters seems to break the parser of the
version of bash shipped with OSX:

    GNU bash, version 3.2.57(1)-release (x86_64-apple-darwin15)
@jhoblitt jhoblitt force-pushed the tickets/DM-9526-pkgroot-cleanups branch from 58eaa40 to 3de52ef Compare April 17, 2017 18:50
@jhoblitt
Copy link
Member Author

There is still a weird failure on osx that I don't fully understand but it seems to be caused by travis running the build from a non-login shell. The rvm folks have a work around for it:

rvm/rvm@cbc4488

However, I'm going to go ahead and merge this since I can't reproduce the failure by hand.

@jhoblitt jhoblitt merged commit 7d4c6de into lsst:master Apr 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants