github-repos/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-26 14:30:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix load of various plugins: fastfile, keychain, sfffe, stack

Browse Source
This commit is contained in:
Marc Cornellà 2020-05-26 17:59:45 +02:00
parent 68d51bd7d8
commit 2d6965f856
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/fastfile/fastfile.plugin.zsh
View File

@ -5,7 +5,7 @@
# If they are not set yet, they will be # If they are not set yet, they will be
# overwritten with their default values # overwritten with their default values
default fastfile_dir "${HOME}/.fastfile/" default fastfile_dir "${HOME}/.fastfile"
default fastfile_var_prefix "§" default fastfile_var_prefix "§"
########################### ###########################
@ -104,7 +104,7 @@ function fastfile_rm() {
# Generate the aliases for the shortcuts # Generate the aliases for the shortcuts
# #
function fastfile_sync() { function fastfile_sync() {
for f in "${fastfile_dir}"/*; do for f in "${fastfile_dir}"/*(N); do
file=`basename "$f"` # To enable simpler handeling of spaces in file names file=`basename "$f"` # To enable simpler handeling of spaces in file names
varkey=`echo "$file" | tr " " "_"` varkey=`echo "$file" | tr " " "_"`

9
plugins/keychain/keychain.plugin.zsh
View File

@ -1,7 +1,9 @@
(( $+commands[keychain] )) || return
# Define SHORT_HOST if not defined (%m = host name up to first .) # Define SHORT_HOST if not defined (%m = host name up to first .)
SHORT_HOST=${SHORT_HOST:-${(%):-%m}} SHORT_HOST=${SHORT_HOST:-${(%):-%m}}
function _start_agent() { function {
local agents local agents
local -a identities local -a identities
local -a options local -a options
@ -28,8 +30,3 @@ function _start_agent() {
[ -f "$_keychain_env_sh" ] && . "$_keychain_env_sh" [ -f "$_keychain_env_sh" ] && . "$_keychain_env_sh"
[ -f "$_keychain_env_sh_gpg" ] && . "$_keychain_env_sh_gpg" [ -f "$_keychain_env_sh_gpg" ] && . "$_keychain_env_sh_gpg"
} }
_start_agent
# tidy up after ourselves
unfunction _start_agent

6
plugins/sfffe/sfffe.plugin.zsh
View File

@ -6,9 +6,9 @@
# REQUIRE: ack # REQUIRE: ack
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
if [ ! -x $(which ack) ]; then if (( ! $+commands[ack] )); then
echo \'ack\' is not installed! echo "'ack' is not installed!"
exit -1 return
fi fi
ajs() { ajs() {

2
plugins/stack/stack.plugin.zsh
View File

@ -1,2 +1,4 @@
(( $+commands[stack] )) || return
autoload -U +X bashcompinit && bashcompinit autoload -U +X bashcompinit && bashcompinit
source <(stack --bash-completion-script stack) source <(stack --bash-completion-script stack)