summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2014-02-19 22:41:22 +0100
committerFlorian Pritz <bluewind@xinu.at>2014-02-19 22:41:22 +0100
commit26d11433f13e69e71c431d021fc1a32d902d2247 (patch)
tree01770b702524acca6cdf34e59852ea2514cf3a24
parent954fbf673152640b035d02b589534ab522b5856e (diff)
Support combining -n and -t to set the tarball namev1.3.2
This does change the default from upload to stdin, but I don't care. Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--fb.12
-rw-r--r--fb.in6
2 files changed, 4 insertions, 4 deletions
diff --git a/fb.1 b/fb.1
index 46d139d..2f8696d 100644
--- a/fb.1
+++ b/fb.1
@@ -87,7 +87,7 @@ will try to extract the ID.
Display a short help message.
.It Fl t
Upload a tar file containing all files and directories specified on the
-command line.
+command line. The file name can be specified with the -n option. (don't add any extensions)
.It Fl v
Display the client version.
.It Fl D
diff --git a/fb.in b/fb.in
index e14fa31..660ed00 100644
--- a/fb.in
+++ b/fb.in
@@ -143,13 +143,13 @@ is_url() {
do_tar_upload() {
if [ "$compress" = "1" ]; then
- file="$tmpdir/upload.tar.gz"
+ file="$tmpdir/$filename.tar.gz"
tar -cf - -- "$@" | gzip -n -c > "$file" || return 1
elif [ "$compress" = "2" ]; then
- file="$tmpdir/upload.tar.xz"
+ file="$tmpdir/$filename.tar.xz"
tar -cf - -- "$@" | xz -c > "$file" || return 1
else
- file="$tmpdir/upload.tar"
+ file="$tmpdir/$filename.tar"
tar -cf "$file" -- "$@" || return 1
fi
compress=0