linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-03-27 03:14:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Armin Grodon 2015-07-14 08:22:12 +02:00
commit 27754f80c9
2 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,13 +42,6 @@ open_jira_issue () {
$open_cmd "${jira_url}/secure/CreateIssue!default.jspa" $open_cmd "${jira_url}/secure/CreateIssue!default.jspa"
elif [[ "$1" = "assigned" || "$1" = "reported" ]]; then elif [[ "$1" = "assigned" || "$1" = "reported" ]]; then
jira_query $@ jira_query $@
else
echo "Opening issue #$1"
if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then
$open_cmd "$jira_url/issues/$jira_prefix$1"
else
$open_cmd "$jira_url/browse/$jira_prefix$1"
fi
else else
local addcomment='' local addcomment=''
if [[ "$2" == "m" ]]; then if [[ "$2" == "m" ]]; then
@ -59,9 +52,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/$1$addcomment" $open_cmd "$jira_url/issues/$jira_prefix$1$addcomment"
else else
$open_cmd "$jira_url/browse/$1$addcomment" $open_cmd "$jira_url/browse/$jira_prefix$1$addcomment"
fi fi
fi fi
} }

9
plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
View file

@ -30,16 +30,17 @@ if [[ "$WORKON_HOME" == "" ]]; then
fi fi
if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
# Automatically activate Git projects's virtual environments based on the # Automatically activate Git projects' virtual environments based on the
# directory name of the project. Virtual environment name can be overridden # directory name of the project. Virtual environment name can be overridden
# by placing a .venv file in the project root with a virtualenv name in it # by placing a .venv file in the project root with a virtualenv name in it
function workon_cwd { function workon_cwd {
if [ ! $WORKON_CWD ]; then if [ ! $WORKON_CWD ]; then
WORKON_CWD=1 WORKON_CWD=1
# Check if this is a Git repo # Check if this is a Git repo
PROJECT_ROOT=`pwd` # Get absolute path, resolving symlinks
PROJECT_ROOT="${PWD:A}"
while [[ "$PROJECT_ROOT" != "/" && ! -e "$PROJECT_ROOT/.venv" ]]; do while [[ "$PROJECT_ROOT" != "/" && ! -e "$PROJECT_ROOT/.venv" ]]; do
PROJECT_ROOT=`realpath $PROJECT_ROOT/..` PROJECT_ROOT="${PROJECT_ROOT:h}"
done done
if [[ "$PROJECT_ROOT" == "/" ]]; then if [[ "$PROJECT_ROOT" == "/" ]]; then
PROJECT_ROOT="." PROJECT_ROOT="."
@ -50,7 +51,7 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then
ENV_NAME="$PROJECT_ROOT/.venv" ENV_NAME="$PROJECT_ROOT/.venv"
elif [[ "$PROJECT_ROOT" != "." ]]; then elif [[ "$PROJECT_ROOT" != "." ]]; then
ENV_NAME=`basename "$PROJECT_ROOT"` ENV_NAME="${PROJECT_ROOT:t}"
else else
ENV_NAME="" ENV_NAME=""
fi fi