From 6955719f0431f37c93bbf8dd4178ba57c6dece4e Mon Sep 17 00:00:00 2001 From: Jaromil Date: Thu, 3 Mar 2022 10:27:35 +0100 Subject: [PATCH] fix shellcheck linter --- Makefile | 2 +- tomb | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 2d5431a..6a523ee 100644 --- a/Makefile +++ b/Makefile @@ -26,4 +26,4 @@ test: make -C extras/test lint: - shellcheck -s zsh -e SC1073,SC1027,SC1072,SC1083,SC1009 tomb + shellcheck -s bash -e SC1058,SC1073,SC1072,SC1009 tomb diff --git a/tomb b/tomb index 0d63ef1..a3f3d86 100755 --- a/tomb +++ b/tomb @@ -131,7 +131,7 @@ _sudo() { _failure "Super user execution not supported: ::1 sudo::" "`option_value --sudo`" ;; esac - + else local msg="[sudo] Enter password for user ::1 user:: to gain superuser privileges" command -v gettext 1>/dev/null 2>/dev/null && msg="$(gettext -s "$msg")" @@ -183,15 +183,15 @@ _endgame() { } # Trap functions for the _endgame event -TRAPINT() { _endgame INT } -TRAPEXIT() { _endgame EXIT } -TRAPHUP() { _endgame HUP } -TRAPQUIT() { _endgame QUIT } -TRAPABRT() { _endgame ABORT } -TRAPKILL() { _endgame KILL } -TRAPPIPE() { _endgame PIPE } -TRAPTERM() { _endgame TERM } -TRAPSTOP() { _endgame STOP } +TRAPINT() { _endgame INT; } +TRAPEXIT() { _endgame EXIT; } +TRAPHUP() { _endgame HUP; } +TRAPQUIT() { _endgame QUIT; } +TRAPABRT() { _endgame ABORT; } +TRAPKILL() { _endgame KILL; } +TRAPPIPE() { _endgame PIPE; } +TRAPTERM() { _endgame TERM; } +TRAPSTOP() { _endgame STOP; } _is_found() { # returns 0 if binary is found in path @@ -1445,7 +1445,7 @@ gen_key() { # Set gpg inputs and options gpgpass="$TOMBSECRET" opt='' - else + else if [ "$2" = "" ]; then while true; do # 3 tries to write two times a matching password @@ -2065,7 +2065,7 @@ lock_tomb_with_key() { return 1 } - + is_valid_tomb $tombpath _message "Commanded to lock tomb ::1 tomb file::" $TOMBFILE