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

Add @apple_old_libdir variable for cleaning up old install data #174

Merged
merged 1 commit into from
Aug 28, 2013

Conversation

ccaviness
Copy link
Contributor

@puppetcla
Copy link

CLA signed by all contributors.

@MosesMendoza
Copy link
Contributor

Note: This is related to puppetlabs/facter#512 and puppetlabs/puppet#1830

@djmitche
Copy link

Will this change the install location to simply /Library/Ruby/Site (the target of the /usr/lib/ruby/site-ruby symlink)? If so, that's awesome, because it obviates the need to install to different locations for different ruby versions, which would make installing things on OS X 10.9 much easier - see #176 for my approach. Maybe a hybrid of the two?

@ccaviness
Copy link
Contributor Author

@djmitche Yeah, this will install in /Library/Ruby/Site directly, which will make it available and usable on all versions of OS X, whether they ship with 1.8 or 2.0.

@djmitche
Copy link

So I'm not sure why it uses a symlink, then? Why not just use /Library/Ruby/Site, or even better, get the path from RbConfig?

@ccaviness
Copy link
Contributor Author

@djmitche Not certain; I think that's a decision out of scope of this pull request (that's how it was when I found it..), though I could easily add to it.

@djmitche
Copy link

Hm, good point. I'd like to get this in ASAP so that everything's ready for 10.9 when it's released, so minimal change is probably good. Given that, +1 :)

@MosesMendoza
Copy link
Contributor

@ccaviness this looks good to me. Tested it too. Since we'll need to merge the changes across all the projects at roughly the same time, I'm going to coordinate with @adrienthebo to make sure everything is good to go with the puppet PRs. Hiera will also need changes similar to puppet and facter, I can port your work over there along with @djmitche's.

@MosesMendoza
Copy link
Contributor

@ccaviness it looks like a merge commit snuck into your PR. Could you rebase against origin/master?

@MosesMendoza
Copy link
Contributor

Related to puppetlabs/hiera#144

@ccaviness
Copy link
Contributor Author

@MosesMendoza I'm unsure how to do that. Last time I tried something involving rebase I ended up with puppetlabs/puppet#1796

@MosesMendoza
Copy link
Contributor

@ccaviness fair enough:) I can pull this in and merge manually. I'm waiting on #176 to be ready and then it can all be merged at once.

@ccaviness
Copy link
Contributor Author

Yeah, see what happens when I try to do anything clever with git? I'll leave this to you :-/

Install into /usr/lib/ruby/site_ruby instead of /usr/lib/ruby/site_ruby/1.8 to
be ruby version independent.
@ccaviness
Copy link
Contributor Author

Ok, I think I sorted it out. Does this look correct?

@adrienthebo
Copy link

@MosesMendoza do we want to handle these merges today?

@MosesMendoza
Copy link
Contributor

@adrienthebo yes, I'm working with @haus on a strategy that varies slightly than what is in some of the open PRs. some new PRs to come.

MosesMendoza added a commit that referenced this pull request Aug 28, 2013
Add @apple_old_libdir variable for cleaning up old install data
@MosesMendoza MosesMendoza merged commit 205f053 into puppetlabs:master Aug 28, 2013
@ccaviness ccaviness deleted the 22005-old-libdir branch September 1, 2013 18:34
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.

5 participants