mrjk-foss/idmgr
mrjk-foss/idmgr
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix: Many little bugs and ps1 management

Browse Source
This commit is contained in:
mrjk 2018-02-10 23:50:38 -05:00
parent ab939c1fa4
commit 3e46d7f6c8
4 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/idmgr
View File

@ -168,7 +168,7 @@ idm_get ()
;; ;;
id_config) id_config)
if [ -f "$value" ]; then if [ -f "$IDM_DIR_ID/$value.env" ]; then
echo "id=$value" echo "id=$value"
cat $IDM_DIR_ID/$value.env cat $IDM_DIR_ID/$value.env
else else
@ -193,7 +193,9 @@ idm_validate ()
[[ "$value" =~ ^[a-zA-Z0-9_-]+$ ]] && return [[ "$value" =~ ^[a-zA-Z0-9_-]+$ ]] && return
;; ;;
id_config) id_config)
[[ -f "$IDM_DIR_ID/$value.env" ]] && return if [[ -f "$IDM_DIR_ID/$value.env" ]]; then
return 0
fi
;; ;;
is_enabled) is_enabled)
[ ! -z "${SHELL_ID}" ] && return [ ! -z "${SHELL_ID}" ] && return
@ -520,7 +522,7 @@ idm_menu_main ()
id=$1 id=$1
elif idm_validate id_config ${2-} ; then elif idm_validate id_config ${2-} ; then
menu=core menu=core
action=ls action=$1
id=$2 id=$2
shift 2 && opt=${@} || true shift 2 && opt=${@} || true
elif idm_validate id_config ${3-} ; then elif idm_validate id_config ${3-} ; then
@ -574,8 +576,7 @@ idm_menu_main ()
return $? return $?
fi fi
idm_log DEBUG "menu=$menu action=$action id=$id opt=$opt" idm_exit 1 "Command not matched: menu=$menu action=$action id=$id opt=$opt"
idm_exit 1 "Command not matched"
} }

4
lib/idmgr_mod_id.sh
View File

@ -67,7 +67,7 @@ idm_id_enable()
idm_id_new () idm_id_new ()
{ {
local id=${1} local id=${2:-$1}
# Local checks # Local checks
idm_validate id $id || idm_exit 1 "Id '$id' is not valid" idm_validate id $id || idm_exit 1 "Id '$id' is not valid"
@ -123,7 +123,7 @@ idm_id_ls ()
# Parse the config # Parse the config
echo $( echo $(
eval "$(idm_get id_config $id)" eval "$(idm_get id_config $id)"
echo "$active:$id:${common_name-} (${email-})" echo "$active:$id::::${common_name-} (${email-})"
) )
done | column -t -s: -o' ' | idm_log DUMP - done | column -t -s: -o' ' | idm_log DUMP -
} }

17
lib/idmgr_mod_ps1.sh
View File

@ -5,7 +5,7 @@ IDM_MOD_DEPS="id pass gpg ssh"
## Prompt functions ## Prompt functions
########################################## ##########################################
SHELL_PS1="${SHELL_PS1:-[\\u@\\h \\W]\\$ }" #SHELL_PS1="${SHELL_PS1:-${PS1}"
idm_ps1 () idm_ps1 ()
{ {
@ -40,24 +40,19 @@ idm_ps1_help ()
idm_ps1_enable () idm_ps1_enable ()
{ {
local id=${1} local id=${1}
id="\[\033[0;34m\]($id)\[\033[00m\]"
echo "export PS1=\"$id \${IDM_SHELL_PS1}\""
# Notes about colors:
# \033]00m\] # for shell # \033]00m\] # for shell
# \[\033]01;31m\] for ps1 # \[\033]01;31m\] for ps1
id="\[\033[0;34m\]($id)\[\033[00m\]"
PS1="$id ${PS1:-$SHELL_PS1}"
echo "export PS1='$PS1'"
echo "export SHELL_PS1='$PS1'"
} }
idm_ps1_disable () idm_ps1_disable ()
{ {
local id=${1} echo "export PS1=\"\${IDM_SHELL_PS1}\""
PS1=$( sed "s/$id[^a-z]* //" <<<${PS1:-$SHELL_PS1} ) return
PS1='[\u@\h \W]\$ '
echo "export PS1='$PS1'"
echo "export SHELL_PS1='$PS1'"
} }
idm_ps1_kill () { idm_ps1_disable ${@-}; } idm_ps1_kill () { idm_ps1_disable ${@-}; }

1
shell/bash.sh
View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
export IDM_SHELL_PS1=${IDM_SHELL_PS1:-${PS1-}}
IDM_SRC_WORDS=${IDM_SRC_WORDS-} IDM_SRC_WORDS=${IDM_SRC_WORDS-}
IDM_BIN=${IDM_BIN:-idmgr} IDM_BIN=${IDM_BIN:-idmgr}