From f8583de80777491edc4661267c7ddf46435908bb Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 6 Nov 2013 19:32:35 +0100 Subject: ship/lib/network: add http_get and http_head refactor anytelnet --- ship/lib/network | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 5 deletions(-) (limited to 'ship/lib') diff --git a/ship/lib/network b/ship/lib/network index bec20254..0e494514 100644 --- a/ship/lib/network +++ b/ship/lib/network @@ -1,6 +1,42 @@ #@include core -anytelnet(){ +# TODO refactor this +which_get_loader(){ + if ! exists curl ; then + if ! exists wget ; then + warn "Please install curl or wget" + return 1 + else + echo "wget -O-" + fi + else + echo "curl" + fi + return 0 +} + +which_head_loader(){ + if ! exists curl ; then + if ! exists wget ; then + warn "Please install curl or wget" + return 1 + else + echo "wget -O- --spider" + fi + else + echo "curl -I" + fi + return 0 +} + +http_get(){ + "$(which_get_loader)" "${1?please provide url}" +} +http_head(){ + "$(which_head_loader)" "${1?please provide url}" +} + +which_telnet(){ # find Telnet or similar and executes it at the end # requires exist # if env TELNET is set, will be trying to run this @@ -16,14 +52,19 @@ anytelnet(){ elif exists nc ;then TELNET="$(command -v nc)" elif exists netcat;then - TELNET="$(command -v netcat)" + echo "$(command -v netcat)" elif exists busybox;then - TELNET="$(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 fi - $TELNET $@ +} + +run_telnet(){ + host="$1" + port="$2" + $(which_telnet) $host $port } send_irc(){ @@ -44,5 +85,5 @@ send_irc(){ echo "JOIN $IRCCHANNEL"; sleep 23; while read line; do echo "PRIVMSG $IRCCHANNEL :$line";sleep 1;done - sleep 5; ) | anytelnet $IRCSERVER $IRCPORT 2>/dev/null | line_to_dot + sleep 5; ) | run_telnet $IRCSERVER $IRCPORT 2>/dev/null | line_to_dot } -- cgit v1.2.3