summaryrefslogtreecommitdiffstats
path: root/fb.in
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2011-09-11 19:29:52 +0200
committerFlorian Pritz <bluewind@xinu.at>2011-09-11 19:29:52 +0200
commitcdf40ee4ebc5f0aa5eefc5d44c9d3424fd0c7159 (patch)
tree08c30351399ca8110d41d76f96f7500085ba446c /fb.in
parente76f369583c059c5ba1d68464886d9b33ed8a78e (diff)
Revert "add -C option: gpg encryption"v0.9
This reverts commit df54bdd9eeb043265a1446f8242037c983047cb0. The way this was implemented is pretty limited so it's better if the user runs gpg manually. Conflicts: fb.in Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'fb.in')
-rw-r--r--fb.in15
1 files changed, 1 insertions, 14 deletions
diff --git a/fb.in b/fb.in
index 4a8d73c..a7b0136 100644
--- a/fb.in
+++ b/fb.in
@@ -15,7 +15,6 @@ VERSION="@VERSION@"
DELETE=
EXTENSION=""
GET=
-ENCRYPT=
TAR=
COMPRESS=0
TAREXT=".tar"
@@ -64,16 +63,6 @@ do_upload() {
file="$TMPDIR/$basefilename.xz"
fi
- basefilename="`basename -- "$file"`"
-
- if [ "$ENCRYPT" = "1" ]; then
- if ! gpg -o "$TMPDIR/$basefilename.gpg" -e "$file"; then
- EXITCODE=1
- return 1
- fi
- file="$TMPDIR/$basefilename.gpg"
- fi
-
TMPFILE=`mktemp "$TMPDIR/data.XXXXXX"`
if [ `stat -c %s -- "$file"` -gt "$WARNSIZE" ]; then
WARNSIZE=`$LIBDIR/fb-helper d "$PASTEBIN/file/get_max_size"`
@@ -131,15 +120,13 @@ usage: [cat |] `basename "$0"` [switches] [options] [<file(s)|ID(s)|folder(s)>]
-t upload a tar file containing all files (and directories)
-c compress the file being uploaded with gz or xz if used 2 times
When used in conjunction with -g this decompresses the download
- -C encrypt the file being uploaded
!
}
-while getopts "e:gdhHtcCv" OPTION; do
+while getopts "e:gdhHtcv" OPTION; do
case $OPTION in
e) EXTENSION="$OPTARG";;
g) GET=1;;
- C) ENCRYPT=1; require_executable gpg;;
c) COMPRESS=`expr $COMPRESS + 1`
if [ "$COMPRESS" == "1" ]; then
TAROPTS="-z"