From c9e41fc7d9ccee5cd31d16b067e7b3bacad8dbe8 Mon Sep 17 00:00:00 2001
From: Sebastian Kinne <contact@sebkinne.com>
Date: Tue, 21 Mar 2017 08:19:12 +1100
Subject: [PATCH] Payload: Fixed CaptivePortal

---
 payloads/library/Captiveportal/README.md   |  2 +-
 payloads/library/Captiveportal/payload.txt | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/payloads/library/Captiveportal/README.md b/payloads/library/Captiveportal/README.md
index 0d70593d..d6dc1789 100644
--- a/payloads/library/Captiveportal/README.md
+++ b/payloads/library/Captiveportal/README.md
@@ -1,7 +1,7 @@
 # Captive Portal for the Bash Bunny
 
 Author: Sebkinne  
-Version: 1.0
+Version: 1.1
 
 ## Description
 
diff --git a/payloads/library/Captiveportal/payload.txt b/payloads/library/Captiveportal/payload.txt
index c044eeac..13e8649e 100644
--- a/payloads/library/Captiveportal/payload.txt
+++ b/payloads/library/Captiveportal/payload.txt
@@ -2,10 +2,7 @@
 #
 # Title:         Captiveportal
 # Author:        Sebkinne
-# Version:       1.0
-
-# Usage of bunny_helpers.sh to avoid problems with find in function startCaptiveportal
-https://forums.hak5.org/index.php?/topic/40237-install-tools/
+# Version:       1.1
 
 # Add or remove inputs here
 INPUTS=(username password)
@@ -18,6 +15,9 @@ ATTACKMODE RNDIS_ETHERNET
 #                  DO NOT EDIT BELOW THIS LINE                   #
 ##################################################################
 
+source bunny_helpers.sh
+WORKINGPATH="/root/udisk/payloads/$SWITCH_POSITION"
+
 # Sets up iptable forwarding and filters
 function setupNetworking() {
     echo 1 > /proc/sys/net/ipv4/ip_forward
@@ -30,8 +30,7 @@ function setupNetworking() {
 
 # Find payload directory and execute payload
 function startCaptiveportal() {
-#    cd $(dirname $(find /root/udisk/payloads/ -name portal.html))
-    cd /root/udisk/payloads/$SWITCH_POSITION
+    cd $WORKINGPATH
     chmod +x captiveportal
     ./captiveportal ${INPUTS[@]}
 }