zawz/shtools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add rmf and default folder value

Browse source
This commit is contained in:
zawz 2020-06-15 16:15:26 +02:00
parent a83529864d
commit 9f001ca20e
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
zpass/zpass
View file

@ -17,6 +17,7 @@ usage()
set <path> <value> Set the value of target set <path> <value> Set the value of target
new <path> [length] Generate a random password at target new <path> [length] Generate a random password at target
rm <path> Delete the target rm <path> Delete the target
rm-file Remove the current file. Shortcut 'rmf'
[Config]: [Config]:
*Variable* *Default value* *Description* *Variable* *Default value* *Description*
@ -293,7 +294,7 @@ remove()
keyfile="$tmpdir/$(randalnum 5).key" keyfile="$tmpdir/$(randalnum 5).key"
# operation # operation
unpack "$tmpdir" "$keyfile" || return $? unpack "$tmpdir" "$keyfile" || return $?
rm "$tmpdir/$1" # delete target rm -rf "$tmpdir/$1" # delete target
pack "$tmpdir" "$keyfile" || return $? pack "$tmpdir" "$keyfile" || return $?
rm -rf "$tmpdir" rm -rf "$tmpdir"
} }
@ -304,11 +305,16 @@ create() {
tmpdir="/tmp/zpass_$(randalnum 5)" tmpdir="/tmp/zpass_$(randalnum 5)"
# pack n repack with no tmp key: create new # pack n repack with no tmp key: create new
unpack "$tmpdir" || return $? unpack "$tmpdir" || return $?
pack "$tmpdir" || return $? pack "$tmpdir" || { echo "Encryption error" >&2 && return 1 ; }
rm -rf "$tmpdir" rm -rf "$tmpdir"
else else
[ -z "$ZPASS_KEY" ] && ZPASS_KEY=$(new_key_with_confirm) || { echo "Cancelled" >&2 && return 100 ; } [ -z "$ZPASS_KEY" ] && ZPASS_KEY=$(new_key_with_confirm) || { echo "Cancelled" >&2 && return 100 ; }
tar -cf - -T /dev/null | encrypt "$ZPASS_KEY" 2>/dev/null > "$file" || { echo "Encryption error" >&2 && return 1 ; } tar -cf - -T /dev/null | encrypt "$ZPASS_KEY" > "$file" || {
echo "Encryption error" >&2
# echo "$tmperr" >&2
rm "$file"
return 1
}
fi fi
} }
@ -333,7 +339,19 @@ tree()
} }
get(){ get(){
{ decrypt || return $?; } | tar -xOf - "$1" 2>/dev/null err=0
tmpdir="/tmp/zpass_$(randalnum 5)" && mkdir -p "$tmpdir"
decrypt | tar -C "$tmpdir" -xf - || err=$?
[ "$err" -eq 0 ] && { (
cd "$tmpdir"
[ -f "$1" ] && cat "$1" && return 0
[ -d "$1" ] && [ -f "$1/default" ] && cat "$1/default" && return 0
return 2
) || err=$? ; }
rm -rf "$tmpdir"
return $err
} }
copy() copy()
@ -346,6 +364,7 @@ clean_cache 2>/dev/null
case $1 in case $1 in
lsf|list-files) ls "$datapath" 2>/dev/null | grep "$ZPASS_EXTENSION\$" | sed "s/$(escape_chars "$ZPASS_EXTENSION")\$//g" ;; lsf|list-files) ls "$datapath" 2>/dev/null | grep "$ZPASS_EXTENSION\$" | sed "s/$(escape_chars "$ZPASS_EXTENSION")\$//g" ;;
rmf|rm-file) rm "$file" ;;
cc|cache-clear) clear_cache 2>/dev/null ;; cc|cache-clear) clear_cache 2>/dev/null ;;
l|ls|list) list $2 ;; l|ls|list) list $2 ;;
t|tree) tree ;; t|tree) tree ;;