From c943935bdaf7226d75c77c83f74598b75b4d945e Mon Sep 17 00:00:00 2001
From: Rob Glew <rglew56@gmail.com>
Date: Tue, 11 Jul 2017 13:29:55 -0500
Subject: [PATCH] Version 0.3.1

---
 README.md               | 4 +---
 install.sh              | 2 ++
 pappyproxy/lists/fuzzdb | 1 -
 pappyproxy/util.py      | 2 +-
 setup.py                | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 160000 pappyproxy/lists/fuzzdb

diff --git a/README.md b/README.md
index b5daa81..438a46b 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ Pappy supports OS X and Linux, and may or may not work in Cygwin or something on
 * python3
 * pip
 * virtualenv
-* go version 1.3 or higher
+* go
 
 To install Pappy:
 
@@ -765,8 +765,6 @@ Changelog
 ---------
 The boring part of the readme
 
-* 0.3.1
-    * Borked the git push so it's version 0.3.1 now
 * 0.3.0
     * Rewrote large amount of code in Go (see the [puppy repo](https://github.com/roglew/puppy) for all the stuff implemented in Go)
     * Rewrote the rest of the python
diff --git a/install.sh b/install.sh
index 6cfe76d..91085f6 100755
--- a/install.sh
+++ b/install.sh
@@ -72,11 +72,13 @@ if ! type "pip" > /dev/null; then
     fi
 fi
 
+cd /tmp
 if python -c "import pappyproxy" &> /dev/null; then
     echo "An earlier version of pappy appears to be installed. Please remove it and try installation again."
     echo "This can likely be done by running \"pip uninstall pappyproxy\""
     exit 1;
 fi
+cd "$INSTALLDIR"
 
 # Set up fake gopath
 if [ -z "$GOPATH" ]; then
diff --git a/pappyproxy/lists/fuzzdb b/pappyproxy/lists/fuzzdb
deleted file mode 160000
index 3a35bfd..0000000
--- a/pappyproxy/lists/fuzzdb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3a35bfdcf5cbfc3598d5c21f7de78a3277b1b259
diff --git a/pappyproxy/util.py b/pappyproxy/util.py
index 4560e76..f57ce74 100644
--- a/pappyproxy/util.py
+++ b/pappyproxy/util.py
@@ -198,7 +198,7 @@ def get_req_data_row(request, client=None):
     Get the row data for a request to be printed.
     """
     if client is not None:
-        rid = client.prefixed_reqid(request)
+        rid = client.get_reqid(request)
     else:
         rid = request.db_id
     method = request.method
diff --git a/setup.py b/setup.py
index 71476d9..d4a959e 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ import pkgutil
 #import pappyproxy
 from setuptools import setup, find_packages
 
-VERSION = "0.3.1"
+VERSION = "0.3.0"
 
 setup(name='pappyproxy',
       version=VERSION,