Bruce/bin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor cleanup/fixes

Browse Source
This commit is contained in:
Bruce Hill 2020-04-07 00:10:47 -07:00
parent 59244e3df8
commit e87a38433e
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
trash
View File

@ -24,6 +24,7 @@ interactive_flag=
force_flag= force_flag=
[ -z "$FS" ] && FS='\t' [ -z "$FS" ] && FS='\t'
[ -z "$RS" ] && RS='\n' [ -z "$RS" ] && RS='\n'
set -o pipefail
fail() { fail() {
echo "$@" 1>&2 echo "$@" 1>&2
@ -56,8 +57,8 @@ pick_trashfiles() {
shift shift
prompt="$1" prompt="$1"
shift shift
ls -A "$td"/info | \ find "$td"/info -mindepth 1 -maxdepth 1 -print0 | \
fzf -1 --prompt="$prompt" --query="$@" --multi \ fzf -1 --read0 --prompt="$prompt" --query="$@" --multi \
--preview="sh -c 'f=\"$td/files/\${1%.trashinfo}\"; [ -d \"\$f\" ] && tree \"\$f\" || echo \"\$f\" && cat \"\$f\"' -- {}" --preview="sh -c 'f=\"$td/files/\${1%.trashinfo}\"; [ -d \"\$f\" ] && tree \"\$f\" || echo \"\$f\" && cat \"\$f\"' -- {}"
} }
@ -157,6 +158,13 @@ DeletionDate=$(date +"%FT%H:%M:%S")
END END
} }
exit_if_trash_empty() {
if ! [ -d "$1" ] || [ -z "$(ls -A "$1/files")" ]; then
echo "Nothing in the trash!"
exit
fi
}
trash_file() { trash_file() {
filename=$1 filename=$1
dir=${filename%/*} dir=${filename%/*}
@ -205,24 +213,18 @@ untrash_files() {
empty_files() { empty_files() {
td="$(get_trashdir "$(readlink -f -- "${1:-$PWD}")")" td="$(get_trashdir "$(readlink -f -- "${1:-$PWD}")")"
if [ -d "$td" ] && [ -z "$(ls -A "$td/files")" ]; then exit_if_trash_empty "$td"
echo "Nothing in the trash!"
exit
fi
pick_trashfiles "$td" "Pick file(s) to permanently delete: " "$@" | \ pick_trashfiles "$td" "Pick file(s) to permanently delete: " "$@" | \
while read -r info; do while read -r info; do
orig="$(path_from_trashinfo "$td/info/$info")" orig="$(path_from_trashinfo "$td/info/$info")"
rm -r $verbose_flag "$td/info/$info" "$td/files/${info%.trashinfo}" || fail "Could not remove file" rm -r $verbose_flag "$td/info/$info" "$td/files/${info%.trashinfo}" || fail "Could not remove file"
done done || return 1
printf '\033[1mDeleted!\033[0m\n' printf '\033[1mDeleted!\033[0m\n'
} }
empty_trash() { empty_trash() {
td="$(get_trashdir "$(readlink -f -- "${1:-$PWD}")")" td="$(get_trashdir "$(readlink -f -- "${1:-$PWD}")")"
if [ -d "$td" ] && [ -z "$(ls -A "$td/files")" ]; then exit_if_trash_empty "$td"
echo "Nothing in the trash!"
exit
fi
( printf '\033[1mThe following files will be deleted:\033[0m\n' && ( printf '\033[1mThe following files will be deleted:\033[0m\n' &&
printf ' \033[33;1m%s\033[0m\n' "$td"/files/* && printf ' \033[33;1m%s\033[0m\n' "$td"/files/* &&
printf '\033[1mThis will free up %s of space\033[0m\n' "$(du -h --summarize "$td/files" | cut -f1)") | more printf '\033[1mThis will free up %s of space\033[0m\n' "$(du -h --summarize "$td/files" | cut -f1)") | more
@ -233,10 +235,7 @@ empty_trash() {
list_trash() { list_trash() {
td="$(get_trashdir "$(readlink -f -- "${1:-$PWD}")")" td="$(get_trashdir "$(readlink -f -- "${1:-$PWD}")")"
if [ -d "$td" ] && [ -z "$(ls -A "$td/files")" ]; then exit_if_trash_empty "$td"
echo "Nothing in the trash!"
exit
fi
for f in "$td/files"/*; do for f in "$td/files"/*; do
printf '%s'"$RS"'%s'"$RS"'%s'"$FS" \ printf '%s'"$RS"'%s'"$RS"'%s'"$FS" \
"$f" "$(date_from_trashinfo "$td/info/$(basename "$f").trashinfo")" \ "$f" "$(date_from_trashinfo "$td/info/$(basename "$f").trashinfo")" \