Add options support + http unification

Deleted specific http and https methods

check.sh

@@ -16,11 +16,20 @@
 #along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-alias echo="/bin/echo -e"
+if [ -z "$color" ]
+then
+	color=1
+fi
+if [ -z "$verbose" ]
+then
+	verbose=1
+fi
+if [ -z "$exit_on_fail" ]
+then
+	exit_on_fail=1
+fi
 
-color=1
-verbose=2
-exit_on_fail=0
+alias echo="/bin/echo -e"
 
 col_reset() {
 	if [ "$color" -gt 0 ]
@@ -225,21 +234,11 @@ _check_http_status() {
 check_http_status() {
 	# $1 url
 	# $2 status
-	_check_http_status http://$1 $2
+	_check_http_status $1 $2
 }
 
 check_http_200() {
-	_check_http_status http://$1 200
-}
-
-check_https_status() {
-	# $1 url
-	# $2 status
-	_check_http_status https://$1 $2
-}
-
-check_https_200() {
-	_check_http_status https://$1 200
+	_check_http_status $1 200
 }
 
 check_https_cert() {
@@ -298,8 +297,14 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 check_audiostream() {
 	# Uses mplayer to fetch 128Kb of stream
 	# $1 Stream URL
+	# $2 size
 	tmpfile=$(mktemp -t check_audiostream.XXXXXXXXX)
-	sz="128kb"
+	
+	sz="$2"
+	if [ -z "$sz" ]
+	then
+		sz="128kb"
+	fi
 	if [ "$verbose" -gt 1 ]
 	then
 		logdate INFO "$tc_name: Running mplayer on '$1' for $sz" 3