Skip to content

Commit

Permalink
Simplify CBIAggregator
Browse files Browse the repository at this point in the history
Remove variables that are only referenced once and never likely to be
overridden.
  • Loading branch information
mickaelistria committed Jul 4, 2022
1 parent 72bbf63 commit 9b62294
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 2 additions & 2 deletions publish-to-maven-central/CBIaggregator.sh
Expand Up @@ -75,10 +75,10 @@ require_executable ${ECLIPSE}
if [ ! -x ${AGGREGATOR} ]
then
echo "Installing the CBI aggregator into ${LOCAL_TOOLS}/${DIR_AGGREGATOR} ..."
${ECLIPSE} -application ${APP_NAME_P2DIRECTOR} \
${ECLIPSE} -application org.eclipse.equinox.p2.director \
-r ${URL_AGG_UPDATES} \
-d ${LOCAL_TOOLS}/${DIR_AGGREGATOR} -p CBIProfile \
-installIU ${IU_AGG_PRODUCT}
-installIU org.eclipse.cbi.p2repo.cli.product
fi
require_executable ${AGGREGATOR}

Expand Down
4 changes: 1 addition & 3 deletions publish-to-maven-central/properties.sh
Expand Up @@ -13,7 +13,6 @@
#********************************************************************************

# ECLIPSE:
APP_NAME_P2DIRECTOR=org.eclipse.equinox.p2.director
DROPS4=/home/data/httpd/download.eclipse.org/eclipse/downloads/drops4
SDK_BUILD_DIR=R-4.24-202206070700
SDK_VERSION=4.24
Expand All @@ -23,9 +22,8 @@ FILE_ECLIPSE=${DROPS4}/${SDK_BUILD_DIR}/eclipse-SDK-${SDK_VERSION}-linux-gtk-x86
ECJ_VERSION=3.30.0

# AGGREGATOR:
IU_AGG_PRODUCT=org.eclipse.cbi.p2repo.cli.product
# URL_AGG_UPDATES=https://download.eclipse.org/cbi/updates/aggregator/headless/4.13/I20200825-1209/
URL_AGG_UPDATES=https://download.eclipse.org/cbi/updates/p2-aggregator/tools/nightly/latest/
URL_AGG_UPDATES=https://download.eclipse.org/cbi/updates/p2-aggregator/products/nightly/latest

# LOCAL TOOLS:
LOCAL_TOOLS=${WORKSPACE}/tools
Expand Down

0 comments on commit 9b62294

Please sign in to comment.