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

fixup example.sh like 2.3.0 main.sh #87

Merged
merged 8 commits into from
Feb 14, 2017
Merged

fixup example.sh like 2.3.0 main.sh #87

merged 8 commits into from
Feb 14, 2017

Conversation

mstreuhofer
Copy link
Collaborator

__i_am_main_script logic fixed for example.sh
added double-sourced test

__i_am_main_script logic fixed for example.sh
added double-sourced test
@zbeekman
Copy link
Collaborator

@mstreuhofer if you're finished, I propose I rebase #86 right onto this PR. What are your thoughts?

@zbeekman
Copy link
Collaborator

i'm done in this PR.
if everybody agrees to the changes you can rebase your branch on mine and just merge yours after. this PR could then be closed.

@mstreuhofer Can I just add my commits to this PR? Because I think I have a fix for the MacOS build failures.... then we can just close one PR... I know @kvz is off enjoying his weekend already, and I don't see any reason why anyone would object to your proposed changes

@@ -5,7 +5,6 @@ ACCPTST:STDIO_REPLACE_DATETIMES
{datetime} UTC [ info] __dir: {root}
{datetime} UTC [ info] __base: main
{datetime} UTC [ info] OSTYPE: {OSTYPE}
{datetime} UTC [ info] Script called directly? yes
Copy link
Collaborator

Choose a reason for hiding this comment

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

Thanks, sorry I missed that

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

np. now let's see what the tests are saying once they are done.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I think I may need to move lanyon to dev dependency

Copy link
Collaborator

Choose a reason for hiding this comment

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

it looks like yarn is still broken, and without mentioning lanyon explicitly in package.json npm ... fails epically... I put it in plain old dependencies, but it looks like @kvz puts them in dev dependencies... yarnpkg/yarn#760 is still unresolved, it appears

@zbeekman
Copy link
Collaborator

I'm going to make this change and then cancel the jobs, except for the latest push and pr job

@mstreuhofer
Copy link
Collaborator Author

ok. i'll stay clear until the dust settled.
good luck.

@zbeekman
Copy link
Collaborator

hmmmm I think 9c747d2 is not the fix... it's already listed in the dev dependencies... The issue may be that lanyon requires bundler which may be missing on OS X.... and of course the OS X CI queues are super backed up as always.

 `npm run start` didn't work for me... I had to get yarn and do `yarn
 install` first. I'm guessing this will be true for others.
 Add tests to help catch bash4-isms and ensure syntax is checked with
 all bashes on PATH in a given system.
@zbeekman
Copy link
Collaborator

It looks like @kvz might be tweaking/fixing lanyon to resolve the OS X build failure... because I'm pretty flummoxed.

Save us, @kvz! lol

@kvz
Copy link
Owner

kvz commented Feb 14, 2017

Trying @zbeekman! With a bunch of commits to master - for which I'm sorry, but I don't have a better way of debugging things on Travis that pass locally. (setting up a Travis VM locally is a bit beyond what I can invest atm).

@kvz
Copy link
Owner

kvz commented Feb 14, 2017

Okay should be good @mstreuhofer @zbeekman (meaning: it's failing on this now: https://travis-ci.org/kvz/bash3boilerplate/jobs/201536450#L2779) - sorry for the delay!

@zbeekman
Copy link
Collaborator

thanks @kvz! Looking good. Not sure what that build failure was about, but the problem seems to have gone away... probably you were on a stale branch?

@lekevbot
Copy link
Collaborator

lekevbot commented Feb 14, 2017 via email

@zbeekman zbeekman merged commit 9b86dcc into master Feb 14, 2017
@mstreuhofer mstreuhofer deleted the fixup-after-230 branch February 14, 2017 20:57
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.

4 participants