Skip to content

(PDB-1455) Correct termini install.sh rubylibdir fallback autodetection#248

Merged
shrug merged 1 commit intopuppetlabs:masterfrom
kbarber:ticket/master/pdb-1455-correct-termini-rubylibdir-autodetection
Jun 2, 2015
Merged

(PDB-1455) Correct termini install.sh rubylibdir fallback autodetection#248
shrug merged 1 commit intopuppetlabs:masterfrom
kbarber:ticket/master/pdb-1455-correct-termini-rubylibdir-autodetection

Conversation

@kbarber
Copy link
Contributor

@kbarber kbarber commented Jun 2, 2015

The autodetection routine for AIO pathed Puppet rubylibdir wasn't working.
This showed up when we tried to point our PuppetDB source based tests at a
the ezbake upgrade branch.

This patch adds the Puppet 4/AIO path to PATH when trying to call ruby to
figure out where the terminus belongs.

Signed-off-by: Ken Barber ken@bob.sh

The autodetection routine for AIO pathed Puppet rubylibdir wasn't working.
This showed up when we tried to point our PuppetDB source based tests at a
the ezbake upgrade branch.

This patch adds the Puppet 4/AIO path to PATH when trying to call ruby to
figure out where the terminus belongs.

Signed-off-by: Ken Barber <ken@bob.sh>
@haus
Copy link
Contributor

haus commented Jun 2, 2015

@kbarber looks sane enough. are there any other /opt/puppet/bin paths kicking around?

@kbarber
Copy link
Contributor Author

kbarber commented Jun 2, 2015

@haus I'm not sure I understand, do you mean "is /opt/puppet/bin still necessary" or do you mean "any other paths we can throw in here for now". :-).

@haus
Copy link
Contributor

haus commented Jun 2, 2015

@kbarber i mean did we miss any other uses of /opt/puppet/bin that will break things in a new PE world 😄

@haus
Copy link
Contributor

haus commented Jun 2, 2015

@kbarber a brief search looks like we're fine here.

@haus
Copy link
Contributor

haus commented Jun 2, 2015

git grep '/opt/puppet/bin'
resources/puppetlabs/lein-ezbake/template/global/install.sh.erb:    local rubylibdir=${rubylibdir:=$(/opt/puppet/bin/ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']" 2>/dev/null || ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")}

@haus
Copy link
Contributor

haus commented Jun 2, 2015

i'm 👍 here

@kbarber
Copy link
Contributor Author

kbarber commented Jun 2, 2015

@haus oh I get you ... yeah, I cannot find a thing.

shrug pushed a commit that referenced this pull request Jun 2, 2015
…ermini-rubylibdir-autodetection

(PDB-1455) Correct termini install.sh rubylibdir fallback autodetection
@shrug shrug merged commit 1d419d7 into puppetlabs:master Jun 2, 2015
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.

3 participants