--- mcore-src/trunk/mcore-tools/daemon/client/include/citrix.client.class 2011/03/10 18:11:32 1641 +++ mcore-src/trunk/mcore-tools/daemon/client/include/citrix.client.class 2012/08/13 11:22:32 2021 @@ -57,6 +57,7 @@ local serverlist local server local server_num + local icafile local CONFIG local i @@ -76,7 +77,8 @@ *) help_citrix_session && return 1 esac - CONFIG="${MCORE_CONFIG_PATH}/citrix/ica/${session}.ica" + icafile="${MCORE_CONFIG_PATH}/citrix/ica/${session}.ica" + CONFIG="${MROOT}/${icafile}" clearconfig addconfig '[WFClient]' @@ -134,20 +136,20 @@ esac # generate fluxbox menu entry - set_fluxbox_menuitem add "${session}" "wfica ${CONFIG}" + set_fluxbox_menuitem add "${session}" "wfica ${icafile}" ;; del) - if [[ -f ${MCORE_CONFIG_PATH}/citrix/ica/${session}.ica ]] + if [[ -f ${MROOT}/${MCORE_CONFIG_PATH}/citrix/ica/${session}.ica ]] then - rm ${MCORE_CONFIG_PATH}/citrix/ica/"${session}".ica + rm ${MROOT}/${MCORE_CONFIG_PATH}/citrix/ica/"${session}".ica set_fluxbox_menuitem del "${session}" elif [[ -z ${file} ]] then # delete all items, needed to loop through every session # or we delete *all* fluxbox menuitem too - for i in ${MCORE_CONFIG_PATH}/citrix/ica/* + for i in ${MROOT}/${MCORE_CONFIG_PATH}/citrix/ica/* do rm ${i} set_fluxbox_menuitem del "$(basename ${i} .ica)" @@ -164,7 +166,7 @@ local i local item - for i in $(find ${MCORE_CONFIG_PATH}/citrix/ica -type f) + for i in $(find ${MROOT}/${MCORE_CONFIG_PATH}/citrix/ica -type f) do item="${item} $(basename ${i} .ica)" done @@ -183,19 +185,19 @@ case "${action}" in add) [[ -z ${server} ]] && help_citrix_serverlist && return 1 - CONFIG="${MCORE_CONFIG_PATH}/citrix/serverlist/${server}" + CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/citrix/serverlist/${server}" clearconfig addconfig "${server}" ;; del) - if [[ -f ${MCORE_CONFIG_PATH}/citrix/serverlist/${server} ]] + if [[ -f ${MROOT}/${MCORE_CONFIG_PATH}/citrix/serverlist/${server} ]] then - rm ${MCORE_CONFIG_PATH}/citrix/serverlist/"${server}" + rm ${MROOT}/${MCORE_CONFIG_PATH}/citrix/serverlist/"${server}" elif [[ -z ${server} ]] then # delete all items - rm ${MCORE_CONFIG_PATH}/citrix/serverlist/* + rm ${MROOT}/${MCORE_CONFIG_PATH}/citrix/serverlist/* fi ;; @@ -208,7 +210,7 @@ local i local item - for i in $(find ${MCORE_CONFIG_PATH}/citrix/serverlist -type f) + for i in $(find ${MROOT}/${MCORE_CONFIG_PATH}/citrix/serverlist -type f) do item="${item} $(basename ${i})" done