Compare commits

...

4 Commits

8 changed files with 15 additions and 13 deletions

View File

@ -10,7 +10,7 @@
|| return 0 || return 0
_CA__ZSH_SHORTCUT_PLUGIN() { _CA__ZSH_SHORTCUT_PLUGIN() {
local OPTIONS=(clone new $(_CA_LIST)) local OPTIONS=($(_CA_GET_LIST))
[ $_CA_ENV ] && OPTIONS=(deactivate $OPTIONS) [ $_CA_ENV ] && OPTIONS=(deactivate $OPTIONS)
local SELECTION=$(echo $OPTIONS | _CA_MULTILINE | _CA_FZF 'select a project') local SELECTION=$(echo $OPTIONS | _CA_MULTILINE | _CA_FZF 'select a project')

View File

@ -11,7 +11,7 @@ _CA__PROJECT_COMPADD() {
_describe 'commands' DESCRIPTIONS _describe 'commands' DESCRIPTIONS
compadd -- $(_CA_LIST) compadd -- $(_CA_GET_LIST)
} }
##################################################################### #####################################################################

View File

@ -5,7 +5,7 @@
# # # #
################################################################### ###################################################################
_CA__VERSION=1.0.0 _CA__VERSION=1.0.3
_CA__DEPENDENCIES=(code-activator fzf jq git) _CA__DEPENDENCIES=(code-activator fzf jq git)
##################################################################### #####################################################################

Binary file not shown.

View File

@ -22,14 +22,14 @@ _CA_MULTILINE() { sed 's/\s\+/\n/g'; }
_CA_LIST() { _CA_LIST() {
local base_dir PROJECTS=() local base_dir PROJECTS=()
{
for base_dir in $CA__DIRS for base_dir in $CA__DIRS
do do
[ ! -d $base_dir ] && continue [ ! -d $base_dir ] && continue
{ cd $base_dir; ls -d *; } \ for project_dir in $(find "$base_dir" -mindepth 1 -maxdepth 1 \( -type d -o -type l \) )
| awk '{print "'$(basename $base_dir)/'"$1;}' do
echo $(basename $base_dir)/$(basename $project_dir)
done
done done
}
} }
##################################################################### #####################################################################

View File

@ -48,9 +48,8 @@ _CA__CUSTOM_ENV_GET_VARIABLE_NAMES() {
_CA__CUSTOM_ENV_GET_FUNCTION_NAMES() { _CA__CUSTOM_ENV_GET_FUNCTION_NAMES() {
{ {
grep -- '^function ' $_CA_ENV | sed 's/function //'
grep -- '[^ #]*()' $_CA_ENV grep -- '[^ #]*()' $_CA_ENV
} | sed 's/().*//' | sort -u } | sed 's/().*//; s/^function //' | sort -u
} }
_CA__CUSTOM_ENV_GET_RESTORE_NAMES() { _CA__CUSTOM_ENV_GET_RESTORE_NAMES() {

View File

@ -1,6 +1,6 @@
_CA__INTERACTIVE_ENV_SETUP() { _CA__INTERACTIVE_ENV_SETUP() {
local PROJECT_PATH="$1" local PROJECT_PATH="$1"
local NO_ENV="$PROJECT_PATH/$_CA__NO_ENV_SENTINEL" local NO_ENV="$PROJECT_PATH/$CA__NO_ENV"
printf 'set up a virtual environment now? [(Y)es / (n)o / n(e)ver] ' printf 'set up a virtual environment now? [(Y)es / (n)o / n(e)ver] '
_CA_READ yn _CA_READ yn
@ -40,7 +40,7 @@ _CA__SELECT_VIRTUAL_ENV() {
_CA__INIT_VIRTUAL_ENV() { _CA__INIT_VIRTUAL_ENV() {
local PROJECT_PATH="$1" local PROJECT_PATH="$1"
local ENV_VERSION="$2" local ENV_VERSION="$2"
local ENV_PATH="$PROJECT_PATH/$_CA__VIRTUAL_ENV_NAME" local ENV_PATH="$PROJECT_PATH/$CA__VIRTUAL_ENV"
[[ $ENV_VERSION =~ ^[0-9] ]]\ [[ $ENV_VERSION =~ ^[0-9] ]]\
&& _CA__INIT_NODE_ENV $ENV_PATH $ENV_VERSION \ && _CA__INIT_NODE_ENV $ENV_PATH $ENV_VERSION \

3
zsh/list.zsh Normal file
View File

@ -0,0 +1,3 @@
_CA_GET_LIST() {
echo "clone new $(_CA_LIST)" | sed 's/ /\n/g'
}