linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-19 21:41:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use standard open command in current plugins

Browse source 
Substitutes the current duplicate logic for the standard
and cross-platform function open_command in plugins:

  frontend-search, jira, node, web-search
This commit is contained in:
Marc Cornellà 2015-08-05 00:32:57 +02:00
parent 2d0bfcf818
commit d1d06b5675
4 changed files with 7 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/frontend-search/frontend-search.plugin.zsh
View file

@ -2,14 +2,6 @@
function frontend() { function frontend() {
# get the open command
local open_cmd
if [[ $(uname -s) == 'Darwin' ]]; then
open_cmd='open'
else
open_cmd='xdg-open'
fi
# no keyword provided, simply show how call methods # no keyword provided, simply show how call methods
if [[ $# -le 1 ]]; then if [[ $# -le 1 ]]; then
echo "Please provide a search-content and a search-term for app.\nEx:\nfrontend <search-content> <search-term>\n" echo "Please provide a search-content and a search-term for app.\nEx:\nfrontend <search-content> <search-term>\n"
@ -113,7 +105,7 @@ function frontend() {
echo "$url" echo "$url"
$open_cmd "$url" open_command "$url"
} }

15
plugins/jira/jira.plugin.zsh
View file

@ -11,13 +11,6 @@
# Usage: jira # opens a new issue # Usage: jira # opens a new issue
# jira ABC-123 # Opens an existing issue # jira ABC-123 # Opens an existing issue
open_jira_issue () { open_jira_issue () {
local open_cmd
if [[ "$OSTYPE" = darwin* ]]; then
open_cmd='open'
else
open_cmd='xdg-open'
fi
if [ -f .jira-url ]; then if [ -f .jira-url ]; then
jira_url=$(cat .jira-url) jira_url=$(cat .jira-url)
elif [ -f ~/.jira-url ]; then elif [ -f ~/.jira-url ]; then
@ -39,7 +32,7 @@ open_jira_issue () {
if [ -z "$1" ]; then if [ -z "$1" ]; then
echo "Opening new issue" echo "Opening new issue"
$open_cmd "${jira_url}/secure/CreateIssue!default.jspa" open_command "${jira_url}/secure/CreateIssue!default.jspa"
elif [[ "$1" = "assigned" || "$1" = "reported" ]]; then elif [[ "$1" = "assigned" || "$1" = "reported" ]]; then
jira_query $@ jira_query $@
else else
@ -52,9 +45,9 @@ open_jira_issue () {
fi fi
if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then
$open_cmd "$jira_url/issues/$jira_prefix$1$addcomment" open_command "$jira_url/issues/$jira_prefix$1$addcomment"
else else
$open_cmd "$jira_url/browse/$jira_prefix$1$addcomment" open_command "$jira_url/browse/$jira_prefix$1$addcomment"
fi fi
fi fi
} }
@ -90,7 +83,7 @@ jira_query () {
return 1 return 1
fi fi
echo "Browsing issues ${verb} ${preposition} ${jira_name}" echo "Browsing issues ${verb} ${preposition} ${jira_name}"
$open_cmd "${jira_url}/secure/IssueNavigator.jspa?reset=true&jqlQuery=${lookup}+%3D+%22${jira_name}%22+AND+resolution+%3D+unresolved+ORDER+BY+priority+DESC%2C+created+ASC" open_command "${jira_url}/secure/IssueNavigator.jspa?reset=true&jqlQuery=${lookup}+%3D+%22${jira_name}%22+AND+resolution+%3D+unresolved+ORDER+BY+priority+DESC%2C+created+ASC"
} }
alias jira='open_jira_issue' alias jira='open_jira_issue'

10
plugins/node/node.plugin.zsh
View file

@ -1,13 +1,5 @@
# Open the node api for your current version to the optional section. # Open the node api for your current version to the optional section.
# TODO: Make the section part easier to use. # TODO: Make the section part easier to use.
function node-docs { function node-docs {
# get the open command open_command "http://nodejs.org/docs/$(node --version)/api/all.html#all_$1"
local open_cmd
if [[ "$OSTYPE" = darwin* ]]; then
open_cmd='open'
else
open_cmd='xdg-open'
fi
$open_cmd "http://nodejs.org/docs/$(node --version)/api/all.html#all_$1"
} }

12
plugins/web-search/web-search.plugin.zsh
View file

@ -14,16 +14,6 @@ function web_search() {
github "https://github.com/search?q=" github "https://github.com/search?q="
) )
# define the open command
case "$OSTYPE" in
darwin*) open_cmd="open" ;;
cygwin*) open_cmd="cygstart" ;;
linux*) open_cmd="xdg-open" ;;
*) echo "Platform $OSTYPE not supported"
return 1
;;
esac
# check whether the search engine is supported # check whether the search engine is supported
if [[ -z "$urls[$1]" ]]; then if [[ -z "$urls[$1]" ]]; then
echo "Search engine $1 not supported." echo "Search engine $1 not supported."
@ -41,7 +31,7 @@ function web_search() {
url="${(j://:)${(s:/:)urls[$1]}[1,2]}" url="${(j://:)${(s:/:)urls[$1]}[1,2]}"
fi fi
nohup $open_cmd "$url" &>/dev/null open_command "$url"
} }