diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-26 18:30:17 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-26 18:33:13 +0300 |
| commit | 6b8e02c741b9aa46a3ed952a7dcd9dbbe3f64e60 (patch) | |
| tree | 14739b35c45854d99b335465a54c6c47563ab550 /setup_native/scripts | |
| parent | inefficient emptiness check (diff) | |
| download | core-6b8e02c741b9aa46a3ed952a7dcd9dbbe3f64e60.tar.gz core-6b8e02c741b9aa46a3ed952a7dcd9dbbe3f64e60.zip | |
Kill Sun-specific stclient_wrapper
Diffstat (limited to 'setup_native/scripts')
| -rw-r--r-- | setup_native/scripts/makefile.mk | 4 | ||||
| -rw-r--r-- | setup_native/scripts/stclient_wrapper.sh | 66 |
2 files changed, 0 insertions, 70 deletions
diff --git a/setup_native/scripts/makefile.mk b/setup_native/scripts/makefile.mk index de91bd011efe..61dc0b786bf3 100644 --- a/setup_native/scripts/makefile.mk +++ b/setup_native/scripts/makefile.mk @@ -46,10 +46,6 @@ UNIXTEXT= \ $(BIN)$/update.sh \ $(BIN)$/downloadscript.sh -.IF "$(OS)" == "SOLARIS" || "$(OS)" == "LINUX" -UNIXTEXT+= $(BIN)$/stclient_wrapper.sh -.ENDIF - NOARCH=$(BIN)$/noarch FAKEDB=$(NOARCH)/fake-db-1.0-0.noarch.rpm FAKEDBROOT=$(COMMONMISC)/$(TARGET)/fake-db-root diff --git a/setup_native/scripts/stclient_wrapper.sh b/setup_native/scripts/stclient_wrapper.sh deleted file mode 100644 index 52ff8abcb0ee..000000000000 --- a/setup_native/scripts/stclient_wrapper.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# All rights reserved. -# - -if [ `uname -s` = "SunOS" ]; then - STCLIENT=/usr/bin/stclient -else - STCLIENT=/opt/sun/servicetag/bin/stclient -fi - -TARGET_URN= -PRODUCT_NAME= -PRODUCT_VERSION= -PRODUCT_SOURCE= -PARENT_PRODUCT_NAME= -INSTANCE_URN= - -while [ $# -gt 0 ] -do - case "$1" in - -t) TARGET_URN="$2"; shift;; - -p) PRODUCT_NAME="$2"; shift;; - -e) PRODUCT_VERSION="$2"; shift;; - -i) INSTANCE_URN="$2"; shift;; - -P) PARENT_PRODUCT_NAME="$2"; shift;; - -S) PRODUCT_SOURCE="$2"; shift;; - --) shift; break;; - -*) - echo >&2 \ - "usage: $0 -p <product name> -e <product version> -t <urn> -S <source> -P <parent product name> [-i <instance urn>]" - exit 1;; - *) break;; - esac - shift -done - -[ -x "$STCLIENT" ] || exit 1 - -# test if already registered -if [ ! -n $INSTANCE_URN ]; then - TEST=`${STCLIENT} -f -t ${TARGET_URN}`; EXITCODE=$? - - # retry on unexpected error codes - [ ${EXITCODE} -eq 0 -o ${EXITCODE} -eq 225 ] || exit 1 - - # early versions did not have a dedicated exitcode, so need to compare text output - [ ${EXITCODE} -eq 225 -o "${TEST}" = "No records found" ] || echo "${TEST}"; exit 0 -fi - -uname=`uname -p` -zone="global" - -if [ `uname -s` = "SunOS" ]; then - if [ -x /usr/bin/zonename ]; then - zone=`/usr/bin/zonename` - fi -fi - -output=`"${STCLIENT}" -a -p "${PRODUCT_NAME}" -e "${PRODUCT_VERSION}" -t ${TARGET_URN} -S "${PRODUCT_SOURCE}" -P "${PARENT_PRODUCT_NAME}" ${INSTANCE_URN:+"-i"} ${INSTANCE_URN} -m "Sun Microsystems, Inc." -A "${uname}" -z "${zone}"`; EXITCODE=$? - -[ "${INSTANCE_URN}" = "" -a ${EXITCODE} -eq 226 ] && exit 0 - -exit ${EXITCODE} - |