Magellan Linux

  • Back to homepage
    • /[mcore-svn]/mcore-src/trunk/mcore-tools/src/modules/citrix/citrix.client.class.in

    Diff of /mcore-src/trunk/mcore-tools/src/modules/citrix/citrix.client.class.in

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

    revision 2261 by niro, Mon Jan 13 15:32:40 2014 UTC revision 2267 by niro, Mon Jan 13 15:40:40 2014 UTC
    # Line 189  get_citrix_session() Line 189  get_citrix_session()
    189   query)   query)
    190   [[ -n ${PNABROWSE_EXECUTABLE} ]] || eecho "\$PNABROWSE_EXECUTABLE not defined"   [[ -n ${PNABROWSE_EXECUTABLE} ]] || eecho "\$PNABROWSE_EXECUTABLE not defined"
    191   [[ -n ${PNABROWSE_CITRIX_BROWSER} ]] || eecho "\$PNABROWSE_CITRIX_BROWSER not defined"   [[ -n ${PNABROWSE_CITRIX_BROWSER} ]] || eecho "\$PNABROWSE_CITRIX_BROWSER not defined"
    192   if [ -x ${MROOT}/opt/ica-client/util/pnabrowse ]   if [ -x ${MROOT}/${PNABROWSE_EXECUTABLE} ]
    193   then   then
    194   if [[ -n ${PNABROWSE_SESSION_EXCLUDE} ]]   if [[ -n ${PNABROWSE_SESSION_EXCLUDE} ]]
    195   then   then
    196   exclude="| grep -v '${PNABROWSE_SESSION_EXCLUDE}'"   exclude="| grep -v '${PNABROWSE_SESSION_EXCLUDE}'"
    197   fi   fi
    198   sessionlist=( $(${MROOT}/${PNABROWSE_EXECUTABLE} -A "${PNABROWSE_CITRIX_BROWSER}" ${exclude}) )   eval sessionlist=( $(eval ${MROOT}/${PNABROWSE_EXECUTABLE} -A "${PNABROWSE_CITRIX_BROWSER}" ${exclude}) )
    199   sessioncount="${#sessionlist[*]}"   sessioncount="${#sessionlist[*]}"
    200   for (( i=0; i<sessioncount; i++))   for (( i=0; i<sessioncount; i++))
    201   do   do
    # Line 245  set_citrix_serverlist() Line 245  set_citrix_serverlist()
    245   ;;   ;;
    246    
    247   auto)   auto)
    248   if [ -x ${MROOT}/opt/ica-client/util/pnabrowse ]   [[ -n ${PNABROWSE_EXECUTABLE} ]] || eecho "\$PNABROWSE_EXECUTABLE not defined"
    249     [[ -n ${PNABROWSE_CITRIX_BROWSER} ]] || eecho "\$PNABROWSE_CITRIX_BROWSER not defined"
    250     if [ -x ${MROOT}/${PNABROWSE_EXECUTABLE} ]
    251   then   then
    252   if [[ -n ${PNABROWSE_SERVER_EXCLUDE} ]]   if [[ -n ${PNABROWSE_SERVER_EXCLUDE} ]]
    253   then   then
    254   exclude="| grep -v '${PNABROWSE_SERVER_EXCLUDE}'"   exclude="| grep -v '${PNABROWSE_SERVER_EXCLUDE}'"
    255   fi   fi
    256   serverlist=( $(${MROOT}/opt/ica-client/util/pnabrowse -S ica ${exclude}) )   eval serverlist=( $(eval ${MROOT}/${PNABROWSE_EXECUTABLE} -S ${PNABROWSE_CITRIX_BROWSER} ${exclude}) )
    257   servercount="${#serverlist[*]}"   servercount="${#serverlist[*]}"
    258   for (( i=0; i<servercount; i++))   for (( i=0; i<servercount; i++))
    259   do   do
    # Line 261  set_citrix_serverlist() Line 263  set_citrix_serverlist()
    263   addconfig "${server}"   addconfig "${server}"
    264   done   done
    265   else   else
    266   eecho "'${MROOT}/opt/ica-client/util/pnabrowse' executable not found."   eecho "'${MROOT}/${PNABROWSE_SERVER_EXCLUDE}' executable not found."
    267   fi   fi
    268   ;;   ;;
    269    
    # Line 273  get_citrix_serverlist() Line 275  get_citrix_serverlist()
    275  {  {
    276   local action="$1"   local action="$1"
    277   local server="$2"   local server="$2"
    278   local serverlist+ *) help_citrix_session && return 1 ;;   local serverlist
    279   local servercount   local servercount
    280   local i   local i
    281   local exclude   local exclude
    # Line 282  get_citrix_serverlist() Line 284  get_citrix_serverlist()
    284    
    285   case "${action}" in   case "${action}" in
    286   print)   print)
    287   list_files_in_directory ${MROOT}/${MCORE_CONFIG_PATH}/citrix/serverlist ;;   list_files_in_directory ${MROOT}/${MCORE_CONFIG_PATH}/citrix/serverlist ;;
    288   query)   query)
    289   [[ -n ${PNABROWSE_EXECUTABLE} ]] || eecho "\$PNABROWSE_EXECUTABLE not defined"   [[ -n ${PNABROWSE_EXECUTABLE} ]] || eecho "\$PNABROWSE_EXECUTABLE not defined"
    290   [[ -n ${PNABROWSE_CITRIX_BROWSER} ]] || eecho "\$PNABROWSE_CITRIX_BROWSER not defined"   [[ -n ${PNABROWSE_CITRIX_BROWSER} ]] || eecho "\$PNABROWSE_CITRIX_BROWSER not defined"
    291   if [ -x ${MROOT}/${PNABROWSE_EXECUTABLE} ]   if [ -x ${MROOT}/${PNABROWSE_EXECUTABLE} ]
    292   then   then
    293   serverlist=( $(${MROOT}/${PNABROWSE_EXECUTABLE} -S ${PNABROWSE_CITRIX_BROWSER}) )   if [[ -n ${PNABROWSE_SERVER_EXCLUDE} ]]
    294     then
    295     exclude="| grep -v '${PNABROWSE_SERVER_EXCLUDE}'"
    296     fi
    297     eval serverlist=( $(eval ${MROOT}/${PNABROWSE_EXECUTABLE} -S ${PNABROWSE_CITRIX_BROWSER} ${exclude}) )
    298   servercount="${#serverlist[*]}"   servercount="${#serverlist[*]}"
    299   for (( i=0; i<servercount; i++))   for (( i=0; i<servercount; i++))
    300   do   do
    Legend:
    Removed from v.2261  
    changed lines
      Added in v.2267