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

Fix chocolatey package hard-coding c: drive #2046

Closed
wants to merge 2 commits into from

Conversation

petemounce
Copy link
Contributor

This fixes #2032.

@bazel-io
Copy link
Member

bazel-io commented Nov 5, 2016

Can one of the admins verify this patch?

@googlebot
Copy link

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed, please reply here (e.g. I signed it!) and we'll verify. Thanks.


  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If you signed the CLA as a corporation, please let us know the company's name.

@petemounce
Copy link
Contributor Author

Ping @laszlocsomor.

@petemounce
Copy link
Contributor Author

Once the 0.4.0 package has been approved, I'll push this change onto it. If I push it now, the package goes to the back of the queue.

@@ -50,7 +50,7 @@ if ($packageParameters)
}
Install-ChocolateyPath -PathToInstall "$msys2Path\usr\bin" -PathType "Machine"

$addToMsysPath = ($packageDir -replace 'c:\\','/c/') -replace '\\','/'
$addToMsysPath = ($packageDir -replace '^([a-zA-Z]):\\(.*)','/$1/$2') -replace '\\','/'
Copy link
Contributor

@laszlocsomor laszlocsomor Nov 7, 2016

Choose a reason for hiding this comment

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

I think you don't need to match $2 if you're outputting it unaltered.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's true. I like this pattern more since it's more explicit, but I don't feel strongly.

Copy link
Contributor

Choose a reason for hiding this comment

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

ok

Copy link
Contributor

@laszlocsomor laszlocsomor left a comment

Choose a reason for hiding this comment

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

LGTM

EDIT: I meant this for commit 64db96f
Still need to get used to GitHub's review UI.

@laszlocsomor
Copy link
Contributor

I'll import this PR now

@bazel-io bazel-io closed this in 754a84b Nov 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Windows, chocolatey: support drive letters other than C: in chocolatey package.
4 participants