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.

Sign up for GitHub

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

Jump to bottom

Fix issue with dash as the default /bin/sh script executing program. #5177

Merged
merged 1 commit into from
Jun 20, 2016
Merged

Fix issue with dash as the default /bin/sh script executing program. #5177

merged 1 commit into from
Jun 20, 2016

Conversation

hjpotter92
Copy link
Contributor

  • function keyword removed
  • Fixup the if statement and operators

@hjpotter92
Fix issue with dash as the default /bin/sh script executing program.
06aa0df 
 * `function` keyword removed
 * Fixup the `if` statement and operators
mcornella
mcornella reviewed Jun 20, 2016
View reviewed changes
plugins/emacs/emacsclient.sh
@@ -1,6 +1,6 @@
#!/bin/sh
Copy link
Member

Choose a reason for hiding this comment

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

I'd rather just change this one line here to #!/usr/bin/env zsh.

Copy link
Member

Choose a reason for hiding this comment

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

Or not, it doesn't matter. Thanks for the PR

@mcornella mcornella merged commit 909fcef into ohmyzsh:master Jun 20, 2016
@mcornella
Copy link
Member

Thanks!

zhangweifang pushed a commit to zhangweifang/oh-my-zsh that referenced this pull request Jun 21, 2016
@hjpotter92 @zwf
Fix issue with dash as the default /bin/sh script executing progr…
b71411a 
…am. (ohmyzsh#5177)

* `function` keyword removed
 * Fixup the `if` statement and operators
freecastle added a commit to freecastle/oh-my-zsh that referenced this pull request Jun 21, 2016
@freecastle
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
a0f44ec 
* 'master' of https://github.com/robbyrussell/oh-my-zsh:
  bundler plugin: Simplify retrieval of cpu count on OSX (ohmyzsh#5180)
  Fix gfg function completion definition
  Fix man-preview completion definition
  Fix issue with `dash` as the default `/bin/sh` script executing program. (ohmyzsh#5177)
  znt: update to v2.2.1 (ohmyzsh#5174)
  emacs plugin tweak to open buffer from stdin (ohmyzsh#5126)
  Update taskwarrior completion to 2.5.1 (ohmyzsh#5171)
  Remove undesirable hardcoding of PATH into zshrc (ohmyzsh#4925)
  Add README for OSX plugin and refactor plugin file
  Open finder to PWD - part 2 (ohmyzsh#5165)
  Add ofd() to OSX plugin to open finder on current directory (ohmyzsh#5164)
  add 'mvn clean install -DskipTests --offline' alias to speed up maven compile (ohmyzsh#5153)
  Peepcode theme: Don't try to use RVM if it's not available (ohmyzsh#5154)
  Replace _kitchen completion with the version from zsh-users (ohmyzsh#5011)
  Mod: use new debug namespace to avoid deprecation warning (ohmyzsh#4799)
  Fix: Plugin knife: Add relative local path for commands which upload files (ohmyzsh#4240)
sirech pushed a commit to sirech/oh-my-zsh that referenced this pull request Jun 21, 2016
Merge remote-tracking branch 'source/master'
41261d0 
* source/master: (61 commits)
  bundler plugin: Simplify retrieval of cpu count on OSX (ohmyzsh#5180)
  Fix gfg function completion definition
  Fix man-preview completion definition
  Fix issue with `dash` as the default `/bin/sh` script executing program. (ohmyzsh#5177)
  znt: update to v2.2.1 (ohmyzsh#5174)
  emacs plugin tweak to open buffer from stdin (ohmyzsh#5126)
  Update taskwarrior completion to 2.5.1 (ohmyzsh#5171)
  Remove undesirable hardcoding of PATH into zshrc (ohmyzsh#4925)
  Add README for OSX plugin and refactor plugin file
  Open finder to PWD - part 2 (ohmyzsh#5165)
  Add ofd() to OSX plugin to open finder on current directory (ohmyzsh#5164)
  add 'mvn clean install -DskipTests --offline' alias to speed up maven compile (ohmyzsh#5153)
  Peepcode theme: Don't try to use RVM if it's not available (ohmyzsh#5154)
  Replace _kitchen completion with the version from zsh-users (ohmyzsh#5011)
  Mod: use new debug namespace to avoid deprecation warning (ohmyzsh#4799)
  Fix: Plugin knife: Add relative local path for commands which upload files (ohmyzsh#4240)
  Add list-timers to systemd user commands (ohmyzsh#5099)
  Adds ReactNative plugin 📱 (ohmyzsh#5018)
  Fix arcanist aliases (ohmyzsh#5110)
  add plugin react-native (ohmyzsh#4606)
  ...
@hjpotter92 hjpotter92 deleted the emacs branch June 22, 2016 13:29
tedbundyjr pushed a commit to tedbundyjr/oh-my-zsh that referenced this pull request Jun 23, 2016
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
7ddab54 
* 'master' of https://github.com/robbyrussell/oh-my-zsh: (201 commits)
  bundler plugin: Simplify retrieval of cpu count on OSX (ohmyzsh#5180)
  Fix gfg function completion definition
  Fix man-preview completion definition
  Fix issue with `dash` as the default `/bin/sh` script executing program. (ohmyzsh#5177)
  znt: update to v2.2.1 (ohmyzsh#5174)
  emacs plugin tweak to open buffer from stdin (ohmyzsh#5126)
  Update taskwarrior completion to 2.5.1 (ohmyzsh#5171)
  Remove undesirable hardcoding of PATH into zshrc (ohmyzsh#4925)
  Add README for OSX plugin and refactor plugin file
  Open finder to PWD - part 2 (ohmyzsh#5165)
  Add ofd() to OSX plugin to open finder on current directory (ohmyzsh#5164)
  add 'mvn clean install -DskipTests --offline' alias to speed up maven compile (ohmyzsh#5153)
  Peepcode theme: Don't try to use RVM if it's not available (ohmyzsh#5154)
  Replace _kitchen completion with the version from zsh-users (ohmyzsh#5011)
  Mod: use new debug namespace to avoid deprecation warning (ohmyzsh#4799)
  Fix: Plugin knife: Add relative local path for commands which upload files (ohmyzsh#4240)
  Add list-timers to systemd user commands (ohmyzsh#5099)
  Adds ReactNative plugin 📱 (ohmyzsh#5018)
  Fix arcanist aliases (ohmyzsh#5110)
  add plugin react-native (ohmyzsh#4606)
  ...

# Conflicts:
#	README.md
#	lib/git.zsh
#	plugins/branch/branch.plugin.zsh
#	plugins/ember-cli/README.md
#	plugins/github/README.md
#	plugins/github/github.plugin.zsh
#	plugins/history-substring-search/README.md
#	plugins/history-substring-search/update-from-upstream.zsh
#	plugins/zsh-navigation-tools/.config/znt/n-aliases.conf
#	plugins/zsh-navigation-tools/.config/znt/n-cd.conf
#	plugins/zsh-navigation-tools/.config/znt/n-env.conf
#	plugins/zsh-navigation-tools/.config/znt/n-functions.conf
#	plugins/zsh-navigation-tools/.config/znt/n-history.conf
#	plugins/zsh-navigation-tools/.config/znt/n-kill.conf
#	plugins/zsh-navigation-tools/.config/znt/n-list.conf
#	plugins/zsh-navigation-tools/.config/znt/n-options.conf
#	plugins/zsh-navigation-tools/.config/znt/n-panelize.conf
#	plugins/zsh-navigation-tools/README.md
#	plugins/zsh-navigation-tools/n-aliases
#	plugins/zsh-navigation-tools/n-cd
#	plugins/zsh-navigation-tools/n-env
#	plugins/zsh-navigation-tools/n-functions
#	plugins/zsh-navigation-tools/n-history
#	plugins/zsh-navigation-tools/n-kill
#	plugins/zsh-navigation-tools/n-list
#	plugins/zsh-navigation-tools/n-list-draw
#	plugins/zsh-navigation-tools/n-list-input
#	plugins/zsh-navigation-tools/n-options
#	plugins/zsh-navigation-tools/n-panelize
#	plugins/zsh-navigation-tools/znt-history-widget
#	plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
clairegriffin added a commit to clairegriffin/oh-my-zsh that referenced this pull request Jul 5, 2016
@clairegriffin
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
1aa1c01 
* 'master' of https://github.com/robbyrussell/oh-my-zsh: (68 commits)
  Rename getgb plugin to gb
  Rename gb completion file to more conventional _gb
  Fix formatting of gb plugin completion
  Add more information to the README
  Add README to gb plugin
  Add plugin for Gb completion (http://getgb.io)
  bundler plugin: Simplify retrieval of cpu count on OSX (ohmyzsh#5180)
  Fix gfg function completion definition
  Fix man-preview completion definition
  Fix issue with `dash` as the default `/bin/sh` script executing program. (ohmyzsh#5177)
  znt: update to v2.2.1 (ohmyzsh#5174)
  emacs plugin tweak to open buffer from stdin (ohmyzsh#5126)
  Update taskwarrior completion to 2.5.1 (ohmyzsh#5171)
  Remove undesirable hardcoding of PATH into zshrc (ohmyzsh#4925)
  Add README for OSX plugin and refactor plugin file
  Open finder to PWD - part 2 (ohmyzsh#5165)
  Add ofd() to OSX plugin to open finder on current directory (ohmyzsh#5164)
  add 'mvn clean install -DskipTests --offline' alias to speed up maven compile (ohmyzsh#5153)
  Peepcode theme: Don't try to use RVM if it's not available (ohmyzsh#5154)
  Replace _kitchen completion with the version from zsh-users (ohmyzsh#5011)
  ...
lesterchan added a commit to lesterchan/oh-my-zsh that referenced this pull request Jul 7, 2016
@lesterchan
Merge remote-tracking branch 'upstream/master'
36a8282 
* upstream/master: (24 commits)
  Rename getgb plugin to gb
  Rename gb completion file to more conventional _gb
  Fix formatting of gb plugin completion
  Add more information to the README
  Add README to gb plugin
  Add plugin for Gb completion (http://getgb.io)
  bundler plugin: Simplify retrieval of cpu count on OSX (ohmyzsh#5180)
  Fix gfg function completion definition
  Fix man-preview completion definition
  Fix issue with `dash` as the default `/bin/sh` script executing program. (ohmyzsh#5177)
  znt: update to v2.2.1 (ohmyzsh#5174)
  emacs plugin tweak to open buffer from stdin (ohmyzsh#5126)
  Update taskwarrior completion to 2.5.1 (ohmyzsh#5171)
  Remove undesirable hardcoding of PATH into zshrc (ohmyzsh#4925)
  Add README for OSX plugin and refactor plugin file
  Open finder to PWD - part 2 (ohmyzsh#5165)
  Add ofd() to OSX plugin to open finder on current directory (ohmyzsh#5164)
  add 'mvn clean install -DskipTests --offline' alias to speed up maven compile (ohmyzsh#5153)
  Peepcode theme: Don't try to use RVM if it's not available (ohmyzsh#5154)
  Replace _kitchen completion with the version from zsh-users (ohmyzsh#5011)
  ...
foobacca pushed a commit to foobacca/oh-my-zsh that referenced this pull request Jul 14, 2016
Merge remote-tracking branch 'origin/master' into personal
93d7828 
* origin/master:
  Rename getgb plugin to gb
  Rename gb completion file to more conventional _gb
  Fix formatting of gb plugin completion
  Add more information to the README
  Add README to gb plugin
  Add plugin for Gb completion (http://getgb.io)
  bundler plugin: Simplify retrieval of cpu count on OSX (ohmyzsh#5180)
  Fix gfg function completion definition
  Fix man-preview completion definition
  Fix issue with `dash` as the default `/bin/sh` script executing program. (ohmyzsh#5177)
  znt: update to v2.2.1 (ohmyzsh#5174)
  emacs plugin tweak to open buffer from stdin (ohmyzsh#5126)
  Update taskwarrior completion to 2.5.1 (ohmyzsh#5171)
  Remove undesirable hardcoding of PATH into zshrc (ohmyzsh#4925)
  Add README for OSX plugin and refactor plugin file
  Open finder to PWD - part 2 (ohmyzsh#5165)
  Add ofd() to OSX plugin to open finder on current directory (ohmyzsh#5164)
  add 'mvn clean install -DskipTests --offline' alias to speed up maven compile (ohmyzsh#5153)
  Peepcode theme: Don't try to use RVM if it's not available (ohmyzsh#5154)
  Replace _kitchen completion with the version from zsh-users (ohmyzsh#5011)
zoli added a commit to zoli/oh-my-zsh that referenced this pull request Jul 17, 2016
@zoli
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
cb14944 
* 'master' of github.com:robbyrussell/oh-my-zsh: (44 commits)
  lib/git.zsh: Added git_commits_behind function (ohmyzsh#4450)
  Rename getgb plugin to gb
  Rename gb completion file to more conventional _gb
  Fix formatting of gb plugin completion
  Add more information to the README
  Add README to gb plugin
  Add plugin for Gb completion (http://getgb.io)
  bundler plugin: Simplify retrieval of cpu count on OSX (ohmyzsh#5180)
  Fix gfg function completion definition
  Fix man-preview completion definition
  Fix issue with `dash` as the default `/bin/sh` script executing program. (ohmyzsh#5177)
  znt: update to v2.2.1 (ohmyzsh#5174)
  emacs plugin tweak to open buffer from stdin (ohmyzsh#5126)
  Update taskwarrior completion to 2.5.1 (ohmyzsh#5171)
  Remove undesirable hardcoding of PATH into zshrc (ohmyzsh#4925)
  Add README for OSX plugin and refactor plugin file
  Open finder to PWD - part 2 (ohmyzsh#5165)
  Add ofd() to OSX plugin to open finder on current directory (ohmyzsh#5164)
  add 'mvn clean install -DskipTests --offline' alias to speed up maven compile (ohmyzsh#5153)
  Peepcode theme: Don't try to use RVM if it's not available (ohmyzsh#5154)
  ...
erwinvaneijk pushed a commit to erwinvaneijk/oh-my-zsh that referenced this pull request Jul 22, 2016
@hjpotter92 @erwinvaneijk
Fix issue with dash as the default /bin/sh script executing progr…
bf93ba7 
…am. (ohmyzsh#5177)

* `function` keyword removed
 * Fixup the `if` statement and operators
atsuya pushed a commit to atsuya/oh-my-zsh that referenced this pull request Jul 23, 2016
@hjpotter92 @atsuya
Fix issue with dash as the default /bin/sh script executing progr…
c4ce75d 
…am. (ohmyzsh#5177)

* `function` keyword removed
 * Fixup the `if` statement and operators
bwkeller pushed a commit to bwkeller/oh-my-zsh that referenced this pull request Aug 6, 2016
@hjpotter92 @bwkeller
Fix issue with dash as the default /bin/sh script executing progr…
e32e44e 
…am. (ohmyzsh#5177)

* `function` keyword removed
 * Fixup the `if` statement and operators
mhowell pushed a commit to mhowell/oh-my-zsh that referenced this pull request Aug 23, 2016
@hjpotter92 @mhowell
Fix issue with dash as the default /bin/sh script executing progr…
cccf4f3 
…am. (ohmyzsh#5177)

* `function` keyword removed
 * Fixup the `if` statement and operators
DennisDenuto pushed a commit to DennisDenuto/oh-my-zsh that referenced this pull request Oct 29, 2016
@hjpotter92 @DennisDenuto
Fix issue with dash as the default /bin/sh script executing progr…
af0f1b0 
…am. (ohmyzsh#5177)

* `function` keyword removed
 * Fixup the `if` statement and operators
avleen pushed a commit to avleen/oh-my-zsh that referenced this pull request Dec 23, 2016
@hjpotter92 @avleen
Fix issue with dash as the default /bin/sh script executing progr…
1b7b566 
…am. (ohmyzsh#5177)

* `function` keyword removed
 * Fixup the `if` statement and operators
clairegriffin added a commit to clairegriffin/oh-my-zsh that referenced this pull request Feb 11, 2017
@clairegriffin
Merge branch 'master' of https://github.com/clairegriffin/oh-my-zsh
76265cf 
* 'master' of https://github.com/clairegriffin/oh-my-zsh: (114 commits)
  Add most recent java
  updated java
  Rename getgb plugin to gb
  Rename gb completion file to more conventional _gb
  Fix formatting of gb plugin completion
  Add more information to the README
  Add README to gb plugin
  Add plugin for Gb completion (http://getgb.io)
  bundler plugin: Simplify retrieval of cpu count on OSX (ohmyzsh#5180)
  Fix gfg function completion definition
  Fix man-preview completion definition
  Fix issue with `dash` as the default `/bin/sh` script executing program. (ohmyzsh#5177)
  znt: update to v2.2.1 (ohmyzsh#5174)
  emacs plugin tweak to open buffer from stdin (ohmyzsh#5126)
  Update taskwarrior completion to 2.5.1 (ohmyzsh#5171)
  Remove undesirable hardcoding of PATH into zshrc (ohmyzsh#4925)
  Add README for OSX plugin and refactor plugin file
  Open finder to PWD - part 2 (ohmyzsh#5165)
  Add ofd() to OSX plugin to open finder on current directory (ohmyzsh#5164)
  add 'mvn clean install -DskipTests --offline' alias to speed up maven compile (ohmyzsh#5153)
  ...
ekcode pushed a commit to ekcode/oh-my-zsh that referenced this pull request Apr 5, 2017
@hjpotter92 @mcornella
Fix issue with dash as the default /bin/sh script executing progr…
09c698c 
…am. (ohmyzsh#5177)

* `function` keyword removed
 * Fixup the `if` statement and operators
seth-cohen pushed a commit to seth-cohen/oh-my-zsh that referenced this pull request Oct 29, 2018
@hjpotter92
Fix issue with dash as the default /bin/sh script executing progr…
d730b46 
…am. (ohmyzsh#5177)

* `function` keyword removed
 * Fixup the `if` statement and operators
jmartindf pushed a commit to jmartindf/oh-my-zsh that referenced this pull request Nov 10, 2018
@hjpotter92 @jmartindf
Fix issue with dash as the default /bin/sh script executing progr…
14e5a27 
…am. (ohmyzsh#5177)

* `function` keyword removed
 * Fixup the `if` statement and operators
spiliopoulos pushed a commit to spiliopoulos/zsh-config that referenced this pull request Jun 17, 2020
@hjpotter92 @spiliopoulos
Fix issue with dash as the default /bin/sh script executing progr…
2f013a7 
…am. (ohmyzsh#5177)

* `function` keyword removed
 * Fixup the `if` statement and operators
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@hjpotter92 @mcornella