--- mcore-src/trunk/mcore-tools/src/modules/citrix/storefront-resolver.in	2015/08/24 14:11:26	2356
+++ mcore-src/trunk/mcore-tools/src/modules/citrix/storefront-resolver.in	2015/08/27 07:38:22	2391
@@ -1,17 +1,13 @@
 #!/bin/bash
 
-CMD="$1"
-USER="$2"
-PASS="$3"
-DOMAIN="$4"
-APP="$5"
-
 BROWSER=""
 : ${STOREFRONT_STORE=""}
 
+source @@SYSCONFDIR@@/mcore/citrix.conf
+
 if [[ -z ${STOREFRONT_STORE} ]]
 then
-	source @@SYSCONFDIR@@/mcore/citrix.conf
+	STOREFRONT_STORE="${DEFAULT_STOREFRONT_STORE}"
 fi
 
 # prefer storebrowse
@@ -92,6 +88,22 @@
 	"${BROWSER}" -L "${APP}" -U "${USER}" -P "${PASS}" -D "${DOMAIN}" "${STOREFRONT_STORE}"
 }
 
+# very basic getops
+for argv in $*
+do
+	case $1 in
+		--enumerate|--launch|--liststore|--addstore|--delstore) CMD="${1//--}" ;;
+		--user) shift; USER="$1" ;;
+		--password) shift; PASS="$1" ;;
+		--domain) shift; DOMAIN="$1" ;;
+		--app) shift; APP="$1" ;;
+		--store) shift; STOREFRONT_STORE="$1" ;;  #override all envvars and configuration vars
+	esac
+	shift
+done
+
+[[ -n ${CMD} ]] || die "No CMD given"
+
 case ${CMD} in
 	enumerate)
 		# enumerate apps