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

Fix: id_ls was broken when no id

Browse Source
This commit is contained in:
mrjk 2018-02-10 23:15:00 -05:00
parent 4604d5355b
commit ab939c1fa4
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/idmgr
View File

@ -164,13 +164,15 @@ idm_get ()
;; ;;
all_id_files) all_id_files)
ls $IDM_DIR_ID/*.env ls $IDM_DIR_ID/*.env || true
;; ;;
id_config) id_config)
if [ -f "$value" ]; then if [ -f "$value" ]; then
echo "id=$value" echo "id=$value"
cat $IDM_DIR_ID/$value.env cat $IDM_DIR_ID/$value.env
else
return 1
fi fi
;; ;;

9
lib/idmgr_mod_id.sh
View File

@ -109,18 +109,23 @@ idm_id_ls ()
local active local active
for id in $(idm_get all_id); do for id in $(idm_get all_id); do
# Check if id is valid
idm_validate id_config $id || continue
# Detect if it is enalbed or not
if [ "$id" == "${SHELL_ID-}" ]; then if [ "$id" == "${SHELL_ID-}" ]; then
active='*' active='*'
else else
active=' ' active=' '
fi fi
# 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 -
} }