summaryrefslogtreecommitdiffstats
path: root/ship/lib/network
diff options
context:
space:
mode:
authortv <tv@nomic.retiolum>2013-11-12 15:33:49 +0100
committertv <tv@nomic.retiolum>2013-11-12 15:33:49 +0100
commit021dd964ba41665562430e87f75ed53380459a68 (patch)
tree55f88e2391539b40afc2c952a66dcb2c43f2db30 /ship/lib/network
parenta6012ff33c05593f4c73b7de55ce09915b6327f9 (diff)
parent8b60dff25e85921fe533f621a1b5d0f8149bf38f (diff)
Merge branch 'master' of https://github.com/krebscode/painload
Diffstat (limited to 'ship/lib/network')
-rw-r--r--ship/lib/network13
1 files changed, 7 insertions, 6 deletions
diff --git a/ship/lib/network b/ship/lib/network
index 0e494514..74edcbac 100644
--- a/ship/lib/network
+++ b/ship/lib/network
@@ -46,15 +46,16 @@ which_telnet(){
# netcat
# busybox telnet
if [ -e "${TELNET:-does_not_exist}" ]; then
- info"Will be using $TELNET as Telnet Client"
+ info "Will be using $TELNET as Telnet Client"
+ echo $TELNET
elif exists telnet ;then
- TELNET="$(command -v telnet)"
+ command -v telnet
elif exists nc ;then
- TELNET="$(command -v nc)"
+ command -v nc
elif exists netcat;then
- echo "$(command -v netcat)"
+ command -v netcat
elif exists busybox;then
- echo "$(command -v busybox) telnet"
+ echo `command -v busybox` telnet
else
error "Cannot find telnet binary, please install either telnet-client or busybox or netcat or provided TELNET environment.\nbailing out!"
return 1
@@ -64,7 +65,7 @@ which_telnet(){
run_telnet(){
host="$1"
port="$2"
- $(which_telnet) $host $port
+ $(which_telnet) "$host" "$port"
}
send_irc(){