search

scmbreeze / scm_breeze

Adds numbered shortcuts to the output git status, and much more
https://madebynathan.com/2011/10/19/git-shortcuts-like-youve-never-seen-before/
MIT License
2.82k stars 192 forks source link

Update uninstall.sh, Fixes #205 #223

Closed chrisfinazzo closed 7 years ago

chrisfinazzo commented 7 years ago

Credit to @dleve123 and @hammady for discovering this and suggesting a fix. Should alleviate one potential hurdle for #222.

ghthor commented 7 years ago

Is that fix for sed for OSX/BSD sed? I believe GNU sed doesn't require that.

chrisfinazzo commented 7 years ago

Yes, it is. As this is a general thing any platform could use, should this be an if/else based on the current OS? I don't really have firsthand experience with GNU sed.

In addition, Shellcheck complains about variables inside of the printf - #2059 - if this isn't a big deal I'll leave it, but otherwise I'll clean that up as well.

ghthor commented 7 years ago

Yes, this is used across platforms with, I suspect, Linux being the largest install base. If/Else should be added.

I'd rather has the fixes for printf is a separate PR if that isn't too much trouble.

Thanks for your work! =)

chrisfinazzo commented 7 years ago

Sigh. Now my repo's gone insane. Here's what I'd like to push and the error:

screen shot 2017-01-31 at 4 53 51 pm 
$ git push origin fix-uninstall-script
fatal: fix-uninstall-script cannot be resolved to branch.
ghthor commented 7 years ago

That's pretty strange!

On Tue, Jan 31, 2017 at 4:57 PM, Chris Finazzo notifications@github.com wrote:

Sigh. Now my repo's gone insane. Here's what I'd like to push and the error:

[image: screen shot 2017-01-31 at 4 53 51 pm] https://cloud.githubusercontent.com/assets/1534882/22486075/0f805150-e7d6-11e6-8c46-2570ff8f9388.png

$ git push origin fix-uninstall-script fatal: fix-uninstall-script cannot be resolved to branch.

— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/scmbreeze/scm_breeze/pull/223#issuecomment-276505745, or mute the thread https://github.com/notifications/unsubscribe-auth/AAJyKrXVuRgSitwMWMATlSCxZ5rST6Dcks5rX644gaJpZM4Lr25w .

chrisfinazzo commented 7 years ago

For a relatively simple merge conflict, that's the strangest thing...

Going to trash this and just cut a new branch from master.

chrisfinazzo commented 7 years ago

See #231.