move definition from default-values
This commit is contained in:
parent
a64a427111
commit
edcf7e15b3
2 changed files with 8 additions and 4 deletions
|
@ -56,15 +56,11 @@ if [[ $- = *i* ]] ; then
|
||||||
MYSHELLCONFIG_BASH_COMPLETION="${HOME}/${MYSHELLCONFIG_SUBPATH}/bash_completion.d"
|
MYSHELLCONFIG_BASH_COMPLETION="${HOME}/${MYSHELLCONFIG_SUBPATH}/bash_completion.d"
|
||||||
[ -z "${MYSHELLCONFIG_GIT_SYNC+x}" ] && MYSHELLCONFIG_GIT_SYNC=true
|
[ -z "${MYSHELLCONFIG_GIT_SYNC+x}" ] && MYSHELLCONFIG_GIT_SYNC=true
|
||||||
|
|
||||||
[ -n "${SSH_AGENTS_DIR+x}" ] && export AGENTS_DIR=${HOME}/.ssh/agents
|
|
||||||
[ -n "${SSH_AGENT_SOCKETS_DIR+x}" ] && export AGENTS_DIR=${HOME}/.ssh/agents
|
|
||||||
|
|
||||||
export SGIT="git -C ${MYSHELLCONFIG_BASE}"
|
export SGIT="git -C ${MYSHELLCONFIG_BASE}"
|
||||||
export MYSHELLCONFIG_VIM_PLUGINS
|
export MYSHELLCONFIG_VIM_PLUGINS
|
||||||
|
|
||||||
# Create necessary directories
|
# Create necessary directories
|
||||||
[ -n "${SSH_AGENTS_DIR-x}" ] && mkdir -p "$SSH_AGENTS_DIR"
|
|
||||||
[ -n "${SSH_AGENT_SOCKETS_DIR-x}" ] && mkdir -p "$SSH_AGENT_SOCKETS_DIR"
|
|
||||||
[ -n "${MYSHELLCONFIG_LOGDIR-x}" ] && mkdir -p "$MYSHELLCONFIG_LOGDIR"
|
[ -n "${MYSHELLCONFIG_LOGDIR-x}" ] && mkdir -p "$MYSHELLCONFIG_LOGDIR"
|
||||||
|
|
||||||
cat << EOF >> "${MYSHELLCONFIG_LOGFILE}"
|
cat << EOF >> "${MYSHELLCONFIG_LOGFILE}"
|
||||||
|
|
|
@ -135,3 +135,11 @@ SSH_AUTH_SOCK=\${SSH_AUTH_SOCK}; export SSH_AUTH_SOCK;
|
||||||
SSH_AGENT_PID=\${SSH_AGENT_PID}; export SSH_AGENT_PID;
|
SSH_AGENT_PID=\${SSH_AGENT_PID}; export SSH_AGENT_PID;
|
||||||
echo Agent pid \${SSH_AGENT_PID};
|
echo Agent pid \${SSH_AGENT_PID};
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
||||||
|
[ -z "${SSH_ADD_DEFAULT_OPTIONS+x}" ] && { SSH_ADD_DEFAULT_OPTIONS="-t 7200"; export SSH_ADD_DEFAULT_OPTIONS; }
|
||||||
|
[ -z "${SSH_IDENTITIES_DEFAULT_DIR+x}" ] && { SSH_IDENTITIES_DEFAULT_DIR="${HOME}/.ssh/identities"; export SSH_IDENTITIES_DEFAULT_DIR; }
|
||||||
|
[ -z "${SSH_AGENTS_DEFAULT_DIR+x}" ] && { SSH_AGENTS_DEFAULT_DIR="${HOME}/.ssh/agents"; export SSH_AGENTS_DEFAULT_DIR; }
|
||||||
|
[ -z "${SSH_AGENT_SOCKETS_DEFAULT_DIR+x}" ] && { SSH_AGENT_SOCKETS_DEFAULT_DIR="${HOME}/.ssh/agents"; export SSH_AGENT_SOCKETS_DEFAULT_DIR; }
|
||||||
|
[ -n "${SSH_AGENTS_DIR-x}" ] && mkdir -p "$SSH_AGENTS_DIR"
|
||||||
|
[ -n "${SSH_AGENT_SOCKETS_DIR-x}" ] && mkdir -p "$SSH_AGENT_SOCKETS_DIR"
|
||||||
|
|
Loading…
Reference in a new issue