This update to the script fixes a problem where the script would try to inv...

kenneth_suter

03.58.2007 78a841f1f90440f259c0416e53b8873a4b97d17e

 opends/resource/upgrade

@@ -130,23 +130,35 @@
  rm -fr "${INSTANCE_ROOT}/tmp/upgrade"
fi

# Launch the build extractor.
# Configure the appropriate CLASSPATH.
# BuildExtractor uses the existing install's
# jars
CLASSPATH=${INSTANCE_ROOT}/classes
for JAR in ${INSTANCE_ROOT}/lib/*.jar
do
  CLASSPATH=${CLASSPATH}:${JAR}
done
export CLASSPATH
"${JAVA_BIN}" org.opends.quicksetup.upgrader.BuildExtractor "${@}"

if test ${?} -eq 0
# Test for presence of command line arguments
if test -z "$1"
then

  # If no arguments launch web start version
  JAVAWS_VM_ARGS="-Dorg.opends.quicksetup.upgrader.Root=$INSTANCE_ROOT"
  export JAVAWS_VM_ARGS
  if test -z "${OPENDS_UPGRADE_JNLP}"
  then
    OPENDS_UPGRADE_JNLP=http://builds.opends.org/install/QuickUpgrade.jnlp
  fi
  "${JAVAWS_BIN}" "${OPENDS_UPGRADE_JNLP}"

else

  # Launch the build extractor.
  # Configure the appropriate CLASSPATH.
  # BuildExtractor uses the existing install's
  # jars
  CLASSPATH=${INSTANCE_ROOT}/classes
  for JAR in ${INSTANCE_ROOT}/lib/*.jar
  do
    CLASSPATH=${CLASSPATH}:${JAR}
  done
  export CLASSPATH
  "${JAVA_BIN}" org.opends.quicksetup.upgrader.BuildExtractor "${@}"

  if [ -r "${INSTANCE_ROOT}/tmp/upgrade" ]
  then

    # Configure the appropriate CLASSPATH.
    # Unlike BuildExtractor, the Upgrader uses
    # the newly extracted build's jars.
@@ -164,12 +176,8 @@
      rm -fr "${INSTANCE_ROOT}/tmp/upgrade"
    fi
  else
    JAVAWS_VM_ARGS="-Dorg.opends.quicksetup.upgrader.Root=$INSTANCE_ROOT"
    export JAVAWS_VM_ARGS
    if test -z "${OPENDS_UPGRADE_JNLP}" 
    then
      OPENDS_UPGRADE_JNLP=http://builds.opends.org/install/QuickUpgrade.jnlp
    fi
    "${JAVAWS_BIN}" "${OPENDS_UPGRADE_JNLP}"
    # Build extractor didn't work.  Invoke the upgrader
    # to report errors and usage.
    "${JAVA_BIN}" org.opends.quicksetup.upgrader.UpgradeLauncher "${@}"    
  fi
fi