1
=== modified file 'utils/pbput'
2
--- utils/pbput	2012-02-12 23:48:08 +0000
3
+++ utils/pbput	2015-08-06 21:17:21 +0000
4
@@ -20,7 +20,7 @@
5
20
#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
20
#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
6
21
21
7
22
PROG=$(basename $0)
22
PROG=$(basename $0)
9
23
URL="http://pastebin.com"
23
URL="http://paste.ubuntu.com"
10
24
TEMPLATE="$PROG.XXXXXXXXXX"
24
TEMPLATE="$PROG.XXXXXXXXXX"
11
25
[ -d "$TMPDIR" ] && TEMPLATE="$TMPDIR/$TEMPLATE" || TEMPLATE="/tmp/$TEMPLATE"
25
[ -d "$TMPDIR" ] && TEMPLATE="$TMPDIR/$TEMPLATE" || TEMPLATE="/tmp/$TEMPLATE"
12
26
26
13
@@ -31,8 +31,8 @@
14
31
31
15
32
case "$PROG" in
32
case "$PROG" in
16
33
	pbget)
33
	pbget)
19
34
		url=$(echo "$1" | sed -e "s:.com/:.com/download.php?i=:")
34
		url=$(echo "$1")
20
35
		wget -q -O- "$url" | base64 -d | lzma -d > "$TEMP"
35
		wget -q -O- "$url" | grep -A 999999999 '<div class="paste"><pre>' | grep -B 999999999 "^</pre>" | sed -e "s/.*<pre>//" -e "s/^<\/pre>.*//" | base64 -d | lzma -d > "$TEMP"
21
36
		# Support secure uploads
36
		# Support secure uploads
22
37
		if gpg -d "$TEMP" >"$TEMP2" 2>/dev/null; then
37
		if gpg -d "$TEMP" >"$TEMP2" 2>/dev/null; then
23
38
			# Upload was encrypted
38
			# Upload was encrypted
Status:	Merged
Merged at revision:	217
Proposed branch:	lp:~kirkland/pastebinit/fix-pbput-pbget
Merge into:	lp:pastebinit
Diff against target:	23 lines (+3/-3) 1 file modified utils/pbput (+3/-3)
To merge this branch:	bzr merge lp:~kirkland/pastebinit/fix-pbput-pbget
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Pastebinit Developers		2015-08-06	Pending
Review via email: mp+267263@code.launchpad.net
1	=== modified file 'utils/pbput'
2	--- utils/pbput 2012-02-12 23:48:08 +0000
3	+++ utils/pbput 2015-08-06 21:17:21 +0000
4	@@ -20,7 +20,7 @@
5	20	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.	20	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
6	21		21
7	22	PROG=$(basename $0)	22	PROG=$(basename $0)
9	23	URL="http://pastebin.com"	23	URL="http://paste.ubuntu.com"
10	24	TEMPLATE="$PROG.XXXXXXXXXX"	24	TEMPLATE="$PROG.XXXXXXXXXX"
11	25	[ -d "$TMPDIR" ] && TEMPLATE="$TMPDIR/$TEMPLATE" \|\| TEMPLATE="/tmp/$TEMPLATE"	25	[ -d "$TMPDIR" ] && TEMPLATE="$TMPDIR/$TEMPLATE" \|\| TEMPLATE="/tmp/$TEMPLATE"
12	26		26
13	@@ -31,8 +31,8 @@
14	31		31
15	32	case "$PROG" in	32	case "$PROG" in
16	33	pbget)	33	pbget)
19	34	url=$(echo "$1" \| sed -e "s:.com/:.com/download.php?i=:")	34	url=$(echo "$1")
20	35	wget -q -O- "$url" \| base64 -d \| lzma -d > "$TEMP"	35	wget -q -O- "$url" \| grep -A 999999999 '<div class="paste"><pre>' \| grep -B 999999999 "^</pre>" \| sed -e "s/.<pre>//" -e "s/^<\/pre>.//" \| base64 -d \| lzma -d > "$TEMP"
21	36	# Support secure uploads	36	# Support secure uploads
22	37	if gpg -d "$TEMP" >"$TEMP2" 2>/dev/null; then	37	if gpg -d "$TEMP" >"$TEMP2" 2>/dev/null; then
23	38	# Upload was encrypted	38	# Upload was encrypted