Magellan Linux

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 2259 by niro, Mon Jan 13 14:39:52 2014 UTC revision 2263 by niro, Mon Jan 13 15:36:41 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
# Line 206  get_citrix_session() Line 206  get_citrix_session()
206   eecho "'${MROOT}/${PNABROWSE_EXECUTABLE}' executable not found."   eecho "'${MROOT}/${PNABROWSE_EXECUTABLE}' executable not found."
207   fi   fi
208   ;;   ;;
209     *) help_citrix_session && return 1 ;;
210   esac   esac
211  }  }
212    
# Line 244  set_citrix_serverlist() Line 245  set_citrix_serverlist()
245   ;;   ;;
246    
247   auto)   auto)
248   if [ -x ${MROOT}/opt/ica-client/util/pnabrowse ]   if [ -x ${MROOT}/${PNABROWSE_EXECUTABLE} ]
249   then   then
250   if [[ -n ${PNABROWSE_SERVER_EXCLUDE} ]]   if [[ -n ${PNABROWSE_SERVER_EXCLUDE} ]]
251   then   then
252   exclude="| grep -v '${PNABROWSE_SERVER_EXCLUDE}'"   exclude="| grep -v '${PNABROWSE_SERVER_EXCLUDE}'"
253   fi   fi
254   serverlist=( $(${MROOT}/opt/ica-client/util/pnabrowse -S ica ${exclude}) )   serverlist=( $(${MROOT}/${PNABROWSE_EXECUTABLE} -S ${PNABROWSE_CITRIX_BROWSER} ${exclude}) )
255   servercount="${#serverlist[*]}"   servercount="${#serverlist[*]}"
256   for (( i=0; i<servercount; i++))   for (( i=0; i<servercount; i++))
257   do   do
# Line 260  set_citrix_serverlist() Line 261  set_citrix_serverlist()
261   addconfig "${server}"   addconfig "${server}"
262   done   done
263   else   else
264   eecho "'${MROOT}/opt/ica-client/util/pnabrowse' executable not found."   eecho "'${MROOT}/${PNABROWSE_SERVER_EXCLUDE}' executable not found."
265   fi   fi
266   ;;   ;;
267    
# Line 298  get_citrix_serverlist() Line 299  get_citrix_serverlist()
299   eecho "'${MROOT}/${PNABROWSE_EXECUTABLE}' executable not found."   eecho "'${MROOT}/${PNABROWSE_EXECUTABLE}' executable not found."
300   fi   fi
301   ;;   ;;
302     *) help_citrix_session && return 1 ;;
303   esac   esac
304  }  }

Legend:
Removed from v.2259  
changed lines
  Added in v.2263