updated mrec and pbin

bin/mrec

@@ -6,13 +6,15 @@ if [ "$1" = "" ] && [ ! -f ~/.mrecname ]; then
 	echo "mrec <name>"
 	exit 1
 elif [ "$1" = "" ]; then #stop recording
+	sleep 5
 	name=$(cat ~/.mrecname)
 	rm ~/.mrecname &>/dev/null
 	sleep 0.2
-	mupload ~/.mrecfile.gif "img/${name}.ogv"
+	mupload ~/.mrecfile.gif "img/${name}.gif"
 else #start recording
+	rm ~/.mrecfile.gif &>/dev/null
 	rm ~/.mrecname &>/dev/null
 	sleep 0.2
 	echo "$1" > ~/.mrecname
-	byzanz-record -x "$X" -y "$Y" -w "$W" -h "$H" --delay 0 --exec=mrec-sleep ~/.mrecfile.gif &
+	mconv -y -f x11grab -video_size ${W}x${h} -i $DISPLAY -c:v ffvhuff -c:a none ~/.mrecfile.ogv
 fi

bin/pbin

@@ -1,22 +1,31 @@
-#!/bin/sh
+#!/bin/bash
 
 url="www.pbin.in/upload.php"
 
-if [ "$1" = "" ]; then
-	echo "pbin <file> [name]"
-	exit
-elif [ ! -s "$1" ]; then
-	echo "$1: no such file"
-	exit
+stddata=$(cat -)
+
+if [ "$stddata" = "" ]; then
+	if [ "$1" = "" ]; then
+		echo "pbin <file> [name]"
+		exit
+	elif [ ! -s "$1" ]; then
+		echo "$1: no such file"
+		exit
+	fi
 fi
 
-content=`cat $1`
+if [ "$stddata" = "" ]; then
+	content=`cat $1`
+	name="$2"
+else
+	content="$stddata"
+	name="$1"
+fi
 
-name=`curl "$url" -s -F "name=$2" -F "content=$content"`
+pasteId=`curl "$url" -s -F "name=$name" -F "content=$content"`
 
 if [ $? -eq 0 ]; then
-	echo "http://pbin.in/$name" | xclip
-	echo "http://pbin.in/$name"
+	echo "Your paste should now be at http://pbin.in/$pasteId"
 else
 	echo "There was an error. The file you provided may be too big."
 fi