Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2024-09-21 09:29:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor typo/formatting fixes

Browse Source 
Signed-off-by: Matthieu Crapet <mcrapet@gmail.com>
This commit is contained in:
Matthieu Crapet 2021-01-01 22:35:52 +01:00
parent 02812f4c06
commit c5701793fb
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tomb
View File

@ -76,10 +76,10 @@ unsetopt CASE_MATCH
typeset -AH OPTS # Command line options (see main()) typeset -AH OPTS # Command line options (see main())
# Command context (see _whoami()) # Command context (see _whoami())
typeset -H _USER # Running username typeset -H _USER # Running username
typeset -Hi _UID # Running user identifier typeset -Hi _UID # Running user identifier
typeset -Hi _GID # Running user group identifier typeset -Hi _GID # Running user group identifier
typeset -H _TTY # Connected input terminal typeset -H _TTY # Connected input terminal
# Tomb context (see is_valid_tomb()) # Tomb context (see is_valid_tomb())
typeset -H TOMBPATH # Full path to the tomb typeset -H TOMBPATH # Full path to the tomb
@ -210,7 +210,7 @@ _whoami() {
# Set username from UID or environment # Set username from UID or environment
_USER=$SUDO_USER _USER=$SUDO_USER
[[ -z $_USER ]] && { _USER=$USERNAME } [[ -z $_USER ]] && { _USER=$USERNAME }
[[ -z $_USER ]] && { _USER=$(id -un) } [[ -z $_USER ]] && { _USER=$(id -un) }
[[ -z $_USER ]] && { [[ -z $_USER ]] && {
_failure "Failing to identify the user who is calling us" } _failure "Failing to identify the user who is calling us" }
@ -1116,7 +1116,7 @@ gpg_decrypt() {
_tmp_create _tmp_create
tmpres=$TOMBTMP tmpres=$TOMBTMP
TOMBSECRET=`print - "$gpgpass" | \ TOMBSECRET=`print - "$gpgpass" | \
gpg --decrypt ${gpgpopt[@]} \ gpg --decrypt ${gpgpopt[@]} \
--status-fd 2 --no-mdc-warning --no-permission-warning \ --status-fd 2 --no-mdc-warning --no-permission-warning \
--no-secmem-warning 2> $tmpres` --no-secmem-warning 2> $tmpres`
unset gpgpass unset gpgpass
@ -1409,7 +1409,7 @@ gen_key() {
# if sphinx mode is chosen, use the provided input # if sphinx mode is chosen, use the provided input
# as master password to generate the actual password # as master password to generate the actual password
if [[ ! -z $sphx_host_tmp ]] || [[ ! -z $sphx_user_tmp ]]; then if [[ ! -z $sphx_host_tmp ]] || [[ ! -z $sphx_user_tmp ]]; then
OPTS[--sphx-user]=$sphx_user_tmp OPTS[--sphx-user]=$sphx_user_tmp
OPTS[--sphx-host]=$sphx_host_tmp OPTS[--sphx-host]=$sphx_host_tmp
unset sphx_user_tmp unset sphx_user_tmp
@ -2717,7 +2717,7 @@ FileFilterMatch unoconv "-d document -f txt --stdout %P" /\.rtf.*/i
FileFilterMatch unoconv "-d document -f txt --stdout %P" /\.tex$/i FileFilterMatch unoconv "-d document -f txt --stdout %P" /\.tex$/i
# native html support # native html support
IndexContents HTML* .htm .html .shtml IndexContents HTML* .htm .html .shtml
IndexContents XML* .xml IndexContents XML* .xml
EOF EOF
swish-e -c ${tombmount}/.swishrc -S fs -v3 swish-e -c ${tombmount}/.swishrc -S fs -v3
@ -3197,7 +3197,7 @@ main() {
if [[ $arg == '--' || $arg == '-' ]]; then if [[ $arg == '--' || $arg == '-' ]]; then
ok=1 ok=1
continue #it shouldn't be appended to PARAM continue #it shouldn't be appended to PARAM
elif [[ $arg[1] == '-' ]]; then elif [[ $arg[1] == '-' ]]; then
if [[ $ok == 0 ]]; then if [[ $ok == 0 ]]; then
exitv=127 _failure "Unrecognized option ::1 arg:: for subcommand ::2 subcommand::" $arg $subcommand exitv=127 _failure "Unrecognized option ::1 arg:: for subcommand ::2 subcommand::" $arg $subcommand
fi fi
@ -3264,7 +3264,7 @@ main() {
forge_key $PARAM forge_key $PARAM
;; ;;
# CREATE Step 2: lock -k file.tomb.key file.tomb # CREATE Step 3: lock -k file.tomb.key file.tomb
lock) lock)
lock_tomb_with_key $PARAM lock_tomb_with_key $PARAM
;; ;;
@ -3287,7 +3287,7 @@ main() {
# Close the tomb # Close the tomb
# `slam` is used to force closing. # `slam` is used to force closing.
umount|close) umount|close)
[[ "$subcommand" == "slam" ]] && { [[ "$subcommand" == "slam" ]] && {
SLAM=1 SLAM=1
[[ $LSOF == 0 ]] && { [[ $LSOF == 0 ]] && {
unset SLAM unset SLAM