Browse Source

fix issue '-p' is needed by Debian nc tool

neil 9 years ago
parent
commit
1b2e940d6a
1 changed files with 16 additions and 5 deletions
  1. 16 5
      le.sh

+ 16 - 5
le.sh

@@ -339,15 +339,26 @@ _saveaccountconf() {
 
 
 _startserver() {
 _startserver() {
   content="$1"
   content="$1"
-  _NC="nc -q 1"
-  if nc -h 2>&1 | grep "nmap.org/ncat" >/dev/null ; then
-    _NC="nc"
+  _NC="nc -q 1 -l"
+  
+  nchelp="$(nc -h 2>&1)"
+  if echo "$nchelp" | grep "nmap.org/ncat" >/dev/null ; then
+    _NC="nc -l"
   fi
   fi
+  
+  if echo "$nchelp" | grep "--version" >/dev/null ; then
+    ncver="$(nc --version)"
+    if echo "$ncver" | grep "http://www.deepspace6.net" > /dev/null ; then
+      _NC="$_NC -p"
+    fi
+  fi
+
+  _debug nc "$_NC"
 #  while true ; do
 #  while true ; do
     if [ "$DEBUG" ] ; then
     if [ "$DEBUG" ] ; then
-      echo -e -n "HTTP/1.1 200 OK\r\n\r\n$content" | $_NC -l $Le_HTTPPort -vv
+      echo -e -n "HTTP/1.1 200 OK\r\n\r\n$content" | $_NC $Le_HTTPPort -vv
     else
     else
-      echo -e -n "HTTP/1.1 200 OK\r\n\r\n$content" | $_NC -l $Le_HTTPPort > /dev/null
+      echo -e -n "HTTP/1.1 200 OK\r\n\r\n$content" | $_NC $Le_HTTPPort > /dev/null
     fi
     fi
 #  done
 #  done
 }
 }