Magellan Linux

  • Back to homepage
    • /[mcore-svn]/mcore-src/trunk/mcore-tools/src/include/common.global.class.in

    Diff of /mcore-src/trunk/mcore-tools/src/include/common.global.class.in

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 2428 by niro, Thu Sep 3 08:15:59 2015 UTC revision 2479 by niro, Thu Sep 10 08:48:45 2015 UTC
    # Line 9  mecho() Line 9  mecho()
    9   local webcrlf   local webcrlf
    10    
    11   # print nothing if quiet mode was requested   # print nothing if quiet mode was requested
    12   [[ ${QUIET} = true ]] && return   [[ ${QUIET} = 1 ]] && return
    13    
    14   if [[ ${NOCOLORS} = true ]]   if [[ ${NOCOLORS} = 1 ]]
    15   then   then
    16   COLCYAN=""   COLCYAN=""
    17   COLDEFAULT=""   COLDEFAULT=""
    18   fi   fi
    19    
    20   [[ ${WEBCRLF} = true ]] && webcrlf="<br>"   [[ ${WEBCRLF} = 1 ]] && webcrlf="<br>"
    21    
    22   # respect -n   # respect -n
    23   case $1 in   case $1 in
    # Line 35  eecho() Line 35  eecho()
    35   local opts   local opts
    36   local webcrlf   local webcrlf
    37    
    38   if [[ ${NOCOLORS} = true ]]   if [[ ${NOCOLORS} = 1 ]]
    39   then   then
    40   COLRED=""   COLRED=""
    41   COLDEFAULT=""   COLDEFAULT=""
    42   fi   fi
    43    
    44   [[ ${WEBCRLF} = true ]] && webcrlf="<br>"   [[ ${WEBCRLF} = 1 ]] && webcrlf="<br>"
    45    
    46   # respect -n   # respect -n
    47   case $1 in   case $1 in
    # Line 59  rvecho() Line 59  rvecho()
    59   local opts   local opts
    60   local webcrlf   local webcrlf
    61    
    62   if [[ ${NOCOLORS} = true ]]   if [[ ${NOCOLORS} = 1 ]]
    63   then   then
    64   COLPURPLE=""   COLPURPLE=""
    65   COLDEFAULT=""   COLDEFAULT=""
    66   fi   fi
    67    
    68   [[ ${WEBCRLF} = true ]] && webcrlf="<br>"   [[ ${WEBCRLF} = 1 ]] && webcrlf="<br>"
    69    
    70   # respect -n   # respect -n
    71   case $1 in   case $1 in
    # Line 351  key_fingerprint() Line 351  key_fingerprint()
    351   fi   fi
    352  }  }
    353    
    354    nsslsay()
    355    {
    356     nssl "${SSLSAY_IP}" "${SSLSAY_PORT}" << EOF
    357    auth ${SSLSAY_USER} ${SSLSAY_PASS}
    358    $@
    359    quit
    360    EOF
    361    }
    362    
    363    nsslsay_fingerprint()
    364    {
    365     nssl "${SSLSAY_IP}" "${SSLSAY_PORT}" << EOF
    366    certauth $(certificate_fingerprint)
    367    $@
    368    quit
    369    EOF
    370    }
    Legend:
    Removed from v.2428  
    changed lines
      Added in v.2479