This repository was archived by the owner on Sep 13, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 7
Fix install-unix.sh on mac and probably other OS's #13
Open
dylwhich
wants to merge
2
commits into
magfest-archive:master
Choose a base branch
from
dylwhich:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,11 +42,11 @@ fi | |
| echo installling event_name=$1 | ||
|
|
||
| vm_cmd="cd ~/uber/ && ./run-simple-deploy.sh $1 && rm -f ./run-simple-deploy.sh" | ||
| git clone https://github.com/magfest/ubersystem-deploy | ||
| test -d ubersystem-deploy || git clone https://github.com/magfest/ubersystem-deploy | ||
| cd ubersystem-deploy | ||
| vagrant up | ||
| cp ../installfiles/run-simple-deploy.sh . | ||
| vagrant ssh -c \'$vm_cmd\' | ||
| vagrant ssh -c "$vm_cmd" | ||
|
|
||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ah, this makes a ton of sense, it was actually separating out $vm_cmd recently that made it lose the correct quotes, this fix is great, thanks. I don't know how it was working correctly on my local box (Cygwin on windows) actually... weird. +1 on this |
||
| # not sure how / if we should do this on *nix | ||
| # start http://localhost:8000/uber/accounts/insert_test_admin | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
only issue here: I'd prefer the behavior to be that if ubersystem-deploy already exists, we halt the install. the reason is if we run run-simple-deploy.sh on an existing install, I'm not... 100% sure what's going to happen. at the very least for now I'd call it undefined behavior, though it's more likely to crash because it also clones a bunch of git repos later in the process inside the VM.
the current behavior is that if ubersystem-deploy exists, git will error out with 'can't clone because ubersystem-deploy directory exists' which causes the entire thing to stop.
So, I'd say if we want to test if that dir exists, that's fine, but instead of continuing, we should still error out and say something like
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
or, we could just kill that for now too, the default error message is cryptic but does the right thing. it would be cool to have the more detailed description. if you didn't feel like modifying it right now, you could create an issue like 'display better error message + instructions when ubersystem-deploy already exists'