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

Standardized indentation and moved url encoding/decoding to a more

Browse Source 
standardized location.
This commit is contained in:
Bruce Hill 2020-08-06 15:25:48 -07:00
parent f154424db2
commit 9d18bcc775
1 changed files with 223 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
bin
View File

@ -31,7 +31,7 @@ fail() {
} }
show_usage() { show_usage() {
cat << EOU cat <<-EOU
Usage: $progname [OPTION]... FILE... Usage: $progname [OPTION]... FILE...
Move files into the trash bin. Move files into the trash bin.
@ -104,6 +104,34 @@ has_arg() {
fi fi
} }
encoder=
if command -v php &> /dev/null; then
encoder=php
elif command -v python3 &> /dev/null; then
encoder=python
elif command -v perl &> /dev/null; then
encoder=perl
else
echo "No URL encoder found! Please install php, python3, or perl!" 1>&2
exit 1
fi
urlencode() {
case "$encoder" in
php) php -r 'echo urlencode($argv[1]);' -- "$1" ;;
perl) perl -MURI::Escape -e 'print uri_escape $ARGV[0]' -- "$1" ;;
python) python3 -c 'import urllib.parse, sys; print(urllib.parse.quote(sys.argv[1]))' "$1";;
esac
}
urldecode() {
case "$encoder" in
php) php -r 'echo urldecode($argv[1]);' -- "$1" ;;
perl) perl -MURI::Escape -e 'print uri_unescape $ARGV[0]' -- "$1" ;;
python) python3 -c 'import urllib.parse, sys; print(urllib.parse.unquote(sys.argv[1]))' "$1";;
esac
}
is_valid_trashdir() { is_valid_trashdir() {
[ -d "$1" ] && expr "$(stat -c '%a' "$1")" : '^1[0-7]\{3\}' >/dev/null && ! [ -L "$1" ] [ -d "$1" ] && expr "$(stat -c '%a' "$1")" : '^1[0-7]\{3\}' >/dev/null && ! [ -L "$1" ]
} }
@ -150,8 +178,7 @@ init_trashdir() {
} }
path_from_trashinfo() { path_from_trashinfo() {
#sed -n 's/^Path=//p' "$1" | php -r 'echo urldecode(fgets(STDIN));' urldecode "$(sed -n 's/^Path=//p' "$1")"
sed -n 's/^Path=//p' "$1" | perl -MURI::Escape -ne 'print uri_unescape $_'
} }
date_from_trashinfo() { date_from_trashinfo() {
@ -159,10 +186,9 @@ date_from_trashinfo() {
} }
trashinfo_for_file() { trashinfo_for_file() {
#php -r 'echo urlencode($argv[1]);' -- "$1" cat <<-END
cat <<END
[Trash Info] [Trash Info]
Path=$(perl -MURI::Escape -e 'print uri_escape $ARGV[0]' -- "$1") Path=$(urlencode "$1")
DeletionDate=$(date +"%FT%H:%M:%S") DeletionDate=$(date +"%FT%H:%M:%S")
END END
} }
@ -299,3 +325,4 @@ case "$action" in
done done
;; ;;
esac esac
# vim: ts=2:noexpandtab:ft=sh