PeterCxy/pass-gocrypt
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: PeterCxy:31e65661a5bf4efd81614671fc8619bcd6d06e80
Branches Tags
PeterCxy:master
...
compare: PeterCxy:193960db99ed060503784e37e1002ad6536b2583
Branches Tags
PeterCxy:master

2 commits
31e65661a5 ... 193960db99

Author SHA1 Message Date
Peter Cai 193960db99 Allow overriding close timeout via environment 2022-12-29 16:14:22 -05:00
Peter Cai 771957d2d2 Fix redirection again 2022-12-29 16:09:50 -05:00
1 changed files with 9 additions and 3 deletions
Show stats Expand all files Collapse all files

12
gocrypt.bash
View file

@ -54,12 +54,18 @@ gocrypt_spawn_close_task() {
# Cancel any previous task that might be present
systemctl --user stop "$task_name.timer" > /dev/null 2>&1
# Allow overriding close timeout from env variable
local timeout=$gocrypt_close_timeout
if [ ! -z "$PASS_GOCRYPT_CLOSE_TIMEOUT" ]; then
timeout="$PASS_GOCRYPT_CLOSE_TIMEOUT"
fi
# Create a new task
systemd-run --user --on-active=$gocrypt_close_timeout --unit="$task_name" \
systemd-run --user --on-active=$timeout --unit="$task_name" \
/usr/bin/env flock -x "$(gocrypt_lock_file_path)" /usr/bin/env bash -c \
"fusermount -u '$PREFIX'/'$gocrypt_dec_dir' || fusermount -u -z '$PREFIX'/'$gocrypt_dec_dir'"
echo "Will close the gocryptfs mount after $gocrypt_close_timeout seconds"
echo "Will close the gocryptfs mount after $timeout seconds"
}
_cmd_git() {
@ -156,7 +162,7 @@ gocrypt_close() {
[ $# -eq 0 ] || gocrypt_die "Unexpected argument"
gocrypt_open_check
# Remove the systemd task for closing if present
which systemctl > /dev/null && systemctl --user stop "$(gocrypt_unique_task_identifier).timer" > /dev/null 2>1
which systemctl > /dev/null && systemctl --user stop "$(gocrypt_unique_task_identifier).timer" > /dev/null 2>&1
fusermount -u "$gocrypt_dec_dir" || fusermount -u -z "$gocrypt_dec_dir"
}