forked from Codaisseur/terminal-notifier-guard
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Jamil Bou Kheir
committed
Nov 16, 2013
1 parent
0042bf1
commit 48b6d4b
Showing
4 changed files
with
48 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,19 @@ | ||
| module TerminalNotifier | ||
| module Guard | ||
| module Failed | ||
| <<<<<<< Updated upstream | ||
| BIN_PATH = File.expand_path('../../../../vendor/terminal-notifier-failed.app/Contents/MacOS/terminal-notifier', __FILE__) | ||
| ======= | ||
| terminal_notifier_path = `which terminal-notifier` | ||
| if File.symlink? terminal_notifier_path | ||
| terminal_notifier_path = File.expand_path(File.readlink(terminal_notifier_path), __FILE__) | ||
| end | ||
|
|
||
| BIN_PATH = terminal_notifier_path.empty? ? | ||
| File.expand_path('../../../../vendor/terminal-notifier-failed.app/Contents/MacOS/terminal-notifier', __FILE__) | ||
| : | ||
| terminal_notifier_path | ||
| >>>>>>> Stashed changes | ||
| end | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,19 @@ | ||
| module TerminalNotifier | ||
| module Guard | ||
| module Notify | ||
| <<<<<<< Updated upstream | ||
| BIN_PATH = File.expand_path('../../../../vendor/terminal-notifier-failed.app/Contents/MacOS/terminal-notifier', __FILE__) | ||
| ======= | ||
| terminal_notifier_path = `which terminal-notifier` | ||
| if File.symlink? terminal_notifier_path | ||
| terminal_notifier_path = File.expand_path(File.readlink(terminal_notifier_path), __FILE__) | ||
| end | ||
|
|
||
| BIN_PATH = terminal_notifier_path.empty? ? | ||
| File.expand_path('../../../../vendor/terminal-notifier-failed.app/Contents/MacOS/terminal-notifier', __FILE__) | ||
| : | ||
| terminal_notifier_path | ||
| >>>>>>> Stashed changes | ||
| end | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,19 @@ | ||
| module TerminalNotifier | ||
| module Guard | ||
| module Pending | ||
| <<<<<<< Updated upstream | ||
| BIN_PATH = File.expand_path('../../../../vendor/terminal-notifier-failed.app/Contents/MacOS/terminal-notifier', __FILE__) | ||
| ======= | ||
| terminal_notifier_path = `which terminal-notifier` | ||
| if File.symlink? terminal_notifier_path | ||
| terminal_notifier_path = File.expand_path(File.readlink(terminal_notifier_path), __FILE__) | ||
| end | ||
|
|
||
| BIN_PATH = terminal_notifier_path.empty? ? | ||
| File.expand_path('../../../../vendor/terminal-notifier-failed.app/Contents/MacOS/terminal-notifier', __FILE__) | ||
| : | ||
| terminal_notifier_path | ||
| >>>>>>> Stashed changes | ||
| end | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,19 @@ | ||
| module TerminalNotifier | ||
| module Guard | ||
| module Success | ||
| <<<<<<< Updated upstream | ||
| BIN_PATH = File.expand_path('../../../../vendor/terminal-notifier-failed.app/Contents/MacOS/terminal-notifier', __FILE__) | ||
| ======= | ||
| terminal_notifier_path = `which terminal-notifier` | ||
| if File.symlink? terminal_notifier_path | ||
| terminal_notifier_path = File.expand_path(File.readlink(terminal_notifier_path), __FILE__) | ||
| end | ||
|
|
||
| BIN_PATH = terminal_notifier_path.empty? ? | ||
| File.expand_path('../../../../vendor/terminal-notifier-failed.app/Contents/MacOS/terminal-notifier', __FILE__) | ||
| : | ||
| terminal_notifier_path | ||
| >>>>>>> Stashed changes | ||
| end | ||
| end | ||
| end |