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

Smile plugin. #497

Merged
merged 5 commits into from
Jul 27, 2016
Merged

Smile plugin. #497

merged 5 commits into from
Jul 27, 2016

Conversation

whilei
Copy link
Contributor

@whilei whilei commented Jul 25, 2016

😄

@tresni
Copy link
Collaborator

tresni commented Jul 25, 2016

This is not properly rebased on master.

git remote add upstream https://github.com/matryer/bitbar-plugins.git
git fetch upstream
git checkout smile-plugin
git rebase upstream/master
# Fix merge errors
git push --force origin smile-plugin #assuming your repo is origin

Next time you start a new plugin do the following:

git fetch upstream
git checkout upstream/master -b new-plugin

That should keep your history clear of anything except your new plugin.

@whilei
Copy link
Contributor Author

whilei commented Jul 25, 2016

Thanks for the tips on the clean history. That annoyed me too. Will try to to keep the commits spick and span next time.

@tresni
Copy link
Collaborator

tresni commented Jul 25, 2016

Hmm.. Not sure why all that history is coming with you... Try this:

git checkout smile-plugin -b new-smile # Checkout a new branch based on the old branch so we retain the commit
git checkout upstream/master -B smile-plugin # Checkout upstream/master over top of old branch
git cherry-pick 75b4667 # Cherry-pick the commit into our new smile-plugin branch
git log # Make sure you are good here and everything is as expected!
git push origin smile-plugin --force # Push it to github
git branch -D new-smile # Delete the temp holding branch we don't need

As for the "errors" reported by shellcheck. It's simply doesn't understand the reference to the categories. You can safely suppress those errors (# shellcheck disable=SC2034 on the line preceeding.) See https://github.com/koalaman/shellcheck/wiki/SC2034 for more information.

@matryer
Copy link
Owner

matryer commented Jul 26, 2016

I love this plugin - @irstacks can you please get those final errors solved so we can get this added to the repo?

@whilei
Copy link
Contributor Author

whilei commented Jul 26, 2016

Awesome, thanks @matryer.

@tresni I wound up doing the following

$ git checkout master
$ git reset --hard upstream/master
$ git branch -b new-smile
$ git cherry-pick f9417b5 # (different commit cuz my earlier tanglings)
$ git push origin new-smile:smile-plugin --force

Knocking the shellcheckers off now.

@whilei
Copy link
Contributor Author

whilei commented Jul 26, 2016

There are quite a few emojis that don't properly emoji-ize. I left em because

  1. I'm too lazy to go through and pluck them out.
  2. They'll still work for Github/Slack/etc.

I don't know where to begin addressing the issue w/r/t to BitBar's emojification-izer, but would be happy to pitch in if I can.


Specifically:

  • :squirrel: (:squirrel:), which would be my top priority, although I'm not sure Github supports it (apparently)
  • :shipit: (:shipit:), my second top priority because it is a squirrel,
  • :octocat:, which is not as important, but still somewhat because it's at least half cat and this is the internet,
  • quite a few people ones, like :neckbeard:, :bowtie:, 🤘 , :godmode: , ...
  • the numbers 1️⃣ through 9️⃣, #️⃣, and
  • flags

My list came directly from http://www.webpagefx.com/tools/emoji-cheat-sheet/

@iosdeveloper
Copy link
Collaborator

@irstacks See matryer/xbar#312

@whilei
Copy link
Contributor Author

whilei commented Jul 26, 2016

Noted, @iosdeveloper, thanks.

@whilei whilei mentioned this pull request Jul 26, 2016
@tresni
Copy link
Collaborator

tresni commented Jul 27, 2016

Some of those aren't Unicode emoji. That includes most of the ones you pointed out. Unless you felt like attempting to supply an image for those where appropriate, I don't think it's worth worrying about ;-)

Merging this in!

@tresni tresni merged commit 7b495cf into matryer:master Jul 27, 2016
chrismetcalf pushed a commit to chrismetcalf/bitbar-plugins that referenced this pull request Jan 31, 2018
* Add smile plugin cleanly, I hpoe.

* Fix shellcheck codes.

* Ignore brace expansions shellcheck complaints.

* Don't copy echo's newline.

* Notify what has been copied to clipboard.
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.

4 participants