summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xfb17
1 files changed, 10 insertions, 7 deletions
diff --git a/fb b/fb
index bd4d2b5..07b3bc0 100755
--- a/fb
+++ b/fb
@@ -6,24 +6,27 @@
# (see COPYING for full license text)
#
#----------------------------------------------------
-# only works if useragent contains libcurl
# Dependencies: curl
# Optional: xclip
#----------------------------------------------------
-VERSION="0.6.2"
+VERSION="0.6.3.1"
DELETE=0
EXTENSION=""
GET=0
PASTEBIN="http://paste.xinu.at"
+USERAGENT="fb-client/$VERSION"
do_upload() {
local EXTRA=""
if [[ -n $EXTENSION ]]; then
EXTRA="-F extension=$EXTENSION"
fi
- URL="$(curl -# -n -L $EXTRA -F "file=@$1" "$PASTEBIN/file/do_upload")"
+ TMPFILE=$(mktemp "$TMPDIR/data.XXXXXX")
+ curl -# -n -L -A $USERAGENT $EXTRA -F "file=@$1" "$PASTEBIN/file/do_upload" > $TMPFILE
+ sed '$d' $TMPFILE >&2
+ URL=$(tail -1 $TMPFILE)
echo $URL
echo -n "$URL" | nohup &> /dev/null xclip
}
@@ -63,7 +66,7 @@ done
shift $((OPTIND - 1))
TMPDIR="$(mktemp -d "/tmp/fb.XXXXXX")"
-trap "rm -rf '${TMPDIR}'" EXIT INT TERM
+trap "rm -rf '${TMPDIR}'" EXIT TERM
if (($# == 0)); then
read_stdin "$TMPDIR/stdin"
@@ -71,12 +74,12 @@ if (($# == 0)); then
else
for i in "$@"; do
if [[ $DELETE == 1 ]]; then
- curl -n -L "$PASTEBIN/file/delete/$i"
+ curl -n -L -A $USERAGENT "$PASTEBIN/file/delete/$i"
elif [[ $GET == 1 ]]; then
- curl -s -o - "$PASTEBIN/$i"
+ curl -s -o - -A $USERAGENT "$PASTEBIN/$i"
elif [[ $i =~ ^(f|ht)tp(s)?://.+ ]]; then
cd $TMPDIR
- curl -# -O "$i"
+ curl -# -A $USERAGENT -O "$i"
for f in *; do
do_upload "$f" && rm -f "$f"
done