From 549c206bb8c3a9434294c2064eb25c149fee18bc Mon Sep 17 00:00:00 2001 From: katherine Date: Sat, 19 Mar 2016 23:33:35 -0700 Subject: clean send was a bit ad-hoc; hopefully cleaner to read now --- .config/init/funcs/send | 62 ++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/.config/init/funcs/send b/.config/init/funcs/send index 88b3dbb..e88c8aa 100755 --- a/.config/init/funcs/send +++ b/.config/init/funcs/send @@ -1,5 +1,5 @@ #!/bin/zsh -# quickly send a file to hosted tmp dir +# quickly send a file to hosted /tmp/ dir local name local basename @@ -12,37 +12,35 @@ escapes=(' ' '%20' '"' '%22' '#' '%23' '$' '%24' '@' '%40' '[' '%5b' '\' '%5c' ']' '%5d' '^' '%5e' '`' '%60' '{' '%7b' '|' '%7c' '}' '%7d' '~' '%7e') -if [[ "$1" ]]; then - for i in "$@"; do - [[ -f "$i" ]] \ - || { echo "file '$i' not found"; return 1 } - done - scp "$@" shmibbles.me:http/tmp/ >/dev/null 2>&1 \ - || { echo "sending files failed"; return 1 } - if [[ $? -eq 0 ]]; then - for name in "$@" - do - basename=${name:t} - ssh shmibbles.me "cd http/tmp; chmod o+r \"${basename//\"/\\\"}\"" - if [[ $? -eq 0 ]]; then - { - printf "%s" 'https://shmibbles.me/tmp/' - for c in "${(s::)basename}"; do - if [[ "${escapes[$c]}" == "" ]]; then - printf "%s" "$c" - else - printf "%s" "${escapes[$c]}" - fi - done - } | tee >(xclip -i -selection clipboard) \ - | xclip -i -selection primary + +[[ "$1" ]] \ + || { echo "please specify at least one file to send"; return 1 } + +for i in "$@"; do + [[ -f "$i" ]] \ + || { echo "file '$i' not found"; return 1 } +done + +scp "$@" shmibbles.me:http/tmp/ 2>/dev/null \ + || { echo "sending files failed"; return 1 } + +for name in "$@" +do + basename=${name:t} + + ssh shmibbles.me "cd http/tmp; chmod o+r \"${basename//\"/\\\"}\"" \ + || { echo "making '$name' readable failed"; return 1 } + + { + printf "%s" 'https://shmibbles.me/tmp/' + for c in "${(s::)basename}"; do + if [[ "${escapes[$c]}" == "" ]]; then + printf "%s" "$c" else - echo "making '$name' readable failed" - return 1 + printf "%s" "${escapes[$c]}" fi done - fi -else - echo "specify at least one file to send" - return 1 -fi + } | tee \ + >(xclip -i -selection clipboard) \ + >(xclip -i -selection primary) >/dev/null +done -- cgit v1.2.3