Skip to content

Commit 81e7661

Browse files
committed
jenkins/builds-upload.sh: more verbose, use UPDATES_DEST
1 parent 38c7c8f commit 81e7661

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

scripts/jenkins/builds-upload.sh

+16-15
Original file line numberDiff line numberDiff line change
@@ -12,45 +12,46 @@ SCP="scp"
1212
# https://wiki.eclipse.org/IT_Infrastructure_Doc#Use_mirror_sites.2Fsee_which_mirrors_are_mirroring_my_files.3F
1313
# It is accessible at:
1414
# https://download.eclipse.org/embed-cdt/
15-
DOWNLOAD_ROOT=/home/data/httpd/download.eclipse.org/embed-cdt
16-
DOWNLOAD=${DOWNLOAD_ROOT}/builds/${BRANCH_NAME}
15+
DOWNLOAD_ROOT="/home/data/httpd/download.eclipse.org/embed-cdt"
16+
UPDATES_DEST="${DOWNLOAD_ROOT}//builds/${BRANCH_NAME}"
17+
1718

1819
VERSION=$(ls repositories/ilg.gnumcueclipse.repository/target/ilg.gnumcueclipse.repository-*.zip | sed -e 's/.*repository-\([0-9]*[.][0-9]*[.][0-9]*\)-\(.*\)[.]zip/\1/')
1920
NUMDATE=$(ls repositories/ilg.gnumcueclipse.repository/target/repository/plugins/ilg.gnumcueclipse.core* | sed -e 's/.*core_\([0-9]*[.][0-9]*[.][0-9]*\)[.]\([0-9]*\)[.]jar/\2/')
2021

2122
ARCHIVE_NAME="ilg.gnumcueclipse.repository-${VERSION}-${NUMDATE}"
2223

2324
${SSH} /bin/bash -x << _EOF_
24-
rm -rf ${DOWNLOAD}-temp
25-
rm -rf ${DOWNLOAD}-last
26-
mkdir -p ${DOWNLOAD}-temp
25+
rm -rvf "${UPDATES_DEST}-temp"
26+
rm -rvf "${UPDATES_DEST}-last"
27+
mkdir -pv "${UPDATES_DEST}-temp"
2728
_EOF_
2829

2930
(
30-
cd repositories/ilg.gnumcueclipse.repository/target
31+
cd "repositories/ilg.gnumcueclipse.repository/target"
3132

3233
if [ -f "ilg.gnumcueclipse.repository-${VERSION}-SNAPSHOT.zip" ]
3334
then
3435
# Rename the SNAPSHOT part to the actual timestamp.
35-
mv "ilg.gnumcueclipse.repository-${VERSION}-SNAPSHOT.zip" "${ARCHIVE_NAME}.zip"
36+
mv -v "ilg.gnumcueclipse.repository-${VERSION}-SNAPSHOT.zip" "${ARCHIVE_NAME}.zip"
3637
fi
3738

38-
${SCP} "${ARCHIVE_NAME}.zip" "${SSHUSER}:${DOWNLOAD}-temp/${ARCHIVE_NAME}.zip"
39+
${SCP} -v "${ARCHIVE_NAME}.zip" "${SSHUSER}:${UPDATES_DEST}-temp/${ARCHIVE_NAME}.zip"
3940

4041
shasum -a 256 -p "${ARCHIVE_NAME}.zip" >"${ARCHIVE_NAME}.zip.sha"
41-
${SCP} "${ARCHIVE_NAME}.zip.sha" "${SSHUSER}:${DOWNLOAD}-temp/${ARCHIVE_NAME}.zip.sha"
42+
${SCP} -v "${ARCHIVE_NAME}.zip.sha" "${SSHUSER}:${UPDATES_DEST}-temp/${ARCHIVE_NAME}.zip.sha"
4243
)
4344

4445
${SSH} /bin/bash -x << _EOF_
45-
(cd ${DOWNLOAD}-temp && unzip "${ARCHIVE_NAME}.zip")
46+
(cd ${UPDATES_DEST}-temp && unzip "${ARCHIVE_NAME}.zip")
4647
47-
if [ -d "${DOWNLOAD}" ]
48+
if [ -d "${UPDATES_DEST}" ]
4849
then
49-
mv ${DOWNLOAD} ${DOWNLOAD}-last
50+
mv -v "${UPDATES_DEST}" "${UPDATES_DEST}-last"
5051
fi
51-
mv ${DOWNLOAD}-temp ${DOWNLOAD}
52-
rm -rf ${DOWNLOAD}-last
52+
mv -v "${UPDATES_DEST}-temp" "${UPDATES_DEST}"
53+
rm -rvf "${UPDATES_DEST}-last"
5354
54-
ls -lLR "${DOWNLOAD}"
55+
ls -lLR "${UPDATES_DEST}"
5556
_EOF_
5657

0 commit comments

Comments
 (0)