Automated merge with http://hg.netbeans.org/main/contrib ss-installer_2
authormesnik@netbeans.org
Wed, 23 Jul 2008 12:38:57 +0400
changeset 13667fbdb3abcdb8c
parent 13665 fa6a95fc783f
parent 13666 e9d0eb4ec9f3
child 13668 aa082a6504d4
child 13672 d792d60b45b5
Automated merge with http://hg.netbeans.org/main/contrib
     1.1 --- a/ssinstaller/registration/register.sh	Wed Jul 23 13:11:23 2008 +1200
     1.2 +++ b/ssinstaller/registration/register.sh	Wed Jul 23 12:38:57 2008 +0400
     1.3 @@ -284,12 +284,23 @@
     1.4     echo ""
     1.5  }
     1.6  
     1.7 +cleanServiceTags() {
     1.8 +   UINS=`stclient -f -t $PRODUCT_URN`
     1.9 +   for i in ${UINS}; do
    1.10 +      DEFID=`stclient -g -i $i | grep product_defined_inst_id | cut -d= -f2-`
    1.11 +      if [ "${DEFID}" = "${PRODUCT_INSTANCE_ID}" ]; then
    1.12 +         stclient -d -i $i >/dev/null 2>/dev/null
    1.13 +      fi
    1.14 +   done
    1.15 +}
    1.16 +
    1.17  #
    1.18  # tries to install service tag to the system registry 
    1.19  # in the case of any failure just silently ignore
    1.20  #
    1.21  
    1.22  installServiceTag() {
    1.23 +    cleanServiceTags; 
    1.24     #if [ "`findServiceTag`" = "" ]; then
    1.25        RC=`stclient -a -p "$PRODUCT_NAME" -e "$PRODUCT_VERSION" -t $PRODUCT_URN -I "$PRODUCT_INSTANCE_ID" -F $PARENT_URN -P "$PRODUCT_PARENT" -m "$PRODUCT_VENDOR" -A "$PLATFORM_ARCH" -z "$CONTAINER" -S "$SOURCE"`
    1.26