From 71698c4e78bb0d51244ffed3e59ee8e4ea274eed Mon Sep 17 00:00:00 2001
From: Thomas Battermann <git@thomasba.de>
Date: Fri, 29 Apr 2011 19:34:11 +0200
Subject: [PATCH] modified:   PKGBUILD modified:   paste42.sh

---
 PKGBUILD   |  2 +-
 paste42.sh | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 14bf33e..8ee995f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=paste42
 pkgver=20110429
-pkgrel=1
+pkgrel=3
 pkgdesc="Utility to post text files to paste42.de using curl"
 arch=('i686' 'x86_64')
 url="http://paste42.de/"
diff --git a/paste42.sh b/paste42.sh
index 3b8f374..a844aef 100755
--- a/paste42.sh
+++ b/paste42.sh
@@ -3,21 +3,26 @@
 # tree [-s] [-t "filetype"] [-l] [-h] file
 
 # Variablen initialisieren & defaults setzen
-VERSION="20110429-2"
+VERSION="20110429-3"
 ATTR=''
 OPTS=""
+EXP='0'
 TYPE="text"
 TYPES="4cs abap actionscript3 actionscript ada apache applescript apt_sources asm asp autoconf autohotkey autoit avisynth awk bash basic4gl bf bibtex blitzbasic bnf boo caddcl cadlisp cfdg cfm chaiscript cil clojure c_mac cmake cobol c cpp cpp-qt csharp css cuesheet dcs delphi diff div dos dot d ecmascript eiffel email erlang fo fortran freebasic fsharp gambas gdb genero genie gettext glsl gml gnuplot groovy gwbasic haskell hicest hq9plus html4strict icon idl ini inno intercal io java5 java javascript j jquery kixtart klonec klonecpp latex lisp locobasic logtalk lolcode lotusformulas lotusscript lscript lsl2 lua m68k magiksf make mapbasic matlab mirc mmix modula2 modula3 mpasm mxml mysql newlisp nsis oberon2 objc ocaml-brief ocaml oobas oracle11 oracle8 oxygene oz pascal pcre perl6 perl per pf php-brief php pic16 pike pixelbender plsql postgresql povray powerbuilder powershell progress prolog properties providex purebasic python qbasic q rails rebol reg robots rpmspec rsplus ruby sas scala scheme scilab sdlbasic smalltalk smarty sql systemverilog tcl teraterm text thinbasic tsql typoscript unicon vala vbnet vb verilog vhdl vim visualfoxpro visualprolog whitespace whois winbatch xbasic xml xorg_conf xpp 80"
 
 
 usage() {
 	echo "Usage:"
-	echo "  $0 [-s] [-t \"type\"] [-l] file"
+	echo "  $0 [-s] [-t \"type\"] [-l] [-e 10m|1h|1d|1w|4w|1y|date] file"
 	echo "  -s           not \"public\""
 	echo "  -t <type>    file type"
 	echo "  -l           filetypes"
 	echo "  -h           this help"
 	echo "  -u           check for update"
+	echo "  -e <time>    expiration:"
+	echo "                 10m = 10 minutes ; 1h = 1 hour ; 1d = 1day ;"
+	echo "                 1w = 1 week ; 4w = 4weeks ; 1y = 1 year ;"
+	echo "                 or date: YYYY-MM-DD HH:II:SS"
 }
 
 filetypes() {
@@ -42,14 +47,15 @@ checkUpdate() {
 if [ $# -eq 0 ] ; then usage ; exit ; fi
 
 # argumente auswerten
-while getopts st:lhu opt ; do
+while getopts st:lhue: opt ; do
 	case "$opt" in
 		\-)    break;;
-		s)    ATTR="$ATTR -d \"sec=true\"";;
+		s)    ATTR=$ATTR' -d sec=true';;
 		t)    TYPE=$OPTARG;;
 		[hH]) usage;exit;;
 		l)    filetypes;exit;;
 		u)    checkUpdate;exit;;
+		e)    ATTR=$ATTR' -d exp='$(echo $OPTARG|sed -e 's/[^0-9:\.a-zA-Z ,]//g')
 	esac
 done
 shift $(expr $OPTIND - 1)