use the safer ${..} instead of $.. for variable expansion
diff --git a/hudson-scripts/init.sh b/hudson-scripts/init.sh
index dad7255..4dacac7 100644
--- a/hudson-scripts/init.sh
+++ b/hudson-scripts/init.sh
@@ -13,18 +13,18 @@
 set -o nounset
 set -o errexit
 
-DIRNAME=$(dirname "$0")
+DIRNAME=$(dirname "${0}")
 
 # load bootstrap scripts (starting with _) in order
-for S in $(ls -1 "$DIRNAME/init/_"* | sort -t '.' -k1n);
+for S in $(ls -1 "${DIRNAME}/init/_"* | sort -t '.' -k1n);
 do
-	echo "Loading bootstrap '$S'"
-	source $S
+	echo "Loading bootstrap '${S}'"
+	source ${S}
 done
 
 # load scripts (not starting with _) in order
-for S in $( (ls -1 "$DIRNAME/init/"*;ls -1 "$DIRNAME/init/_"*) | sort -t '.' -k1n | uniq -u );
+for S in $( (ls -1 "${DIRNAME}/init/"*;ls -1 "${DIRNAME}/init/_"*) | sort -t '.' -k1n | uniq -u );
 do
-	LSINFO "Loading '$S'"
-	source $S
+	LSINFO "Loading '${S}'"
+	source ${S}
 done
diff --git a/hudson-scripts/init/0_alias.sh b/hudson-scripts/init/0_alias.sh
index 68bc37e..8621cd8 100644
--- a/hudson-scripts/init/0_alias.sh
+++ b/hudson-scripts/init/0_alias.sh
@@ -18,36 +18,36 @@
     args=
     for arg in $*
     do
-        case $arg in
+        case ${arg} in
             -ireges|-regex)
-                args="$args -regextype posix-extended $arg"
+                args="${args} -regextype posix-extended ${arg}"
                 ;;
             *)
-                args="$args $arg"
+                args="${args} ${arg}"
                 ;;
         esac
     done
     set -f
-    command find $args
+    command find ${args}
     set +f
 }
 
 # define alias depending on the underlying OS 
 # e.g., regex on BSD-like and GNU-like OS are not handled through the same options for
 # find and sed.
-if [[ "$OSTYPE" == "linux"* || "$OSTYPE" == "cygwin"* ]]; then
+if [[ "${OSTYPE}" == "linux"* || "${OSTYPE}" == "cygwin"* ]]; then
 	alias sed-regex="sed -r"
 	alias find-regex="findGnuRegex"
 
 	LSDEBUG 'sed-regex="sed -r"'
 	LSDEBUG 'find-regex="findGnuRegex"'
-elif [[ "$OSTYPE" == "darwin"* || "$OSTYPE" == "freebsd"* ]]; then
+elif [[ "${OSTYPE}" == "darwin"* || "${OSTYPE}" == "freebsd"* ]]; then
 	alias sed-regex="sed -E"
 	alias find-regex="find -E"
 
 	LSDEBUG 'sed-regex="sed -E"'
 	LSDEBUG 'find-regex="find -E"'
 else
-	LSCRITICAL "Unknown 'OSTYPE'=$OSTYPE."
+	LSCRITICAL "Unknown 'OSTYPE'=${OSTYPE}."
 	exit -1
-fi
\ No newline at end of file
+fi
diff --git a/hudson-scripts/init/0_constants.sh b/hudson-scripts/init/0_constants.sh
index 2b0bff3..ff527d6 100644
--- a/hudson-scripts/init/0_constants.sh
+++ b/hudson-scripts/init/0_constants.sh
@@ -21,38 +21,38 @@
 __INTEGRATION_FOLDER="integration"
 __RELEASES_FOLDER="releases"
 __SIMREL_FOLDER="simrel"
-__STAGING_FOLDER="$__SIMREL_FOLDER/staging"
-__MAINTENANCE_FOLDER="$__SIMREL_FOLDER/maintenance"
-__MILESTONES_FOLDER="$__SIMREL_FOLDER/milestones"
+__STAGING_FOLDER="${__SIMREL_FOLDER}/staging"
+__MAINTENANCE_FOLDER="${__SIMREL_FOLDER}/maintenance"
+__MILESTONES_FOLDER="${__SIMREL_FOLDER}/milestones"
 
-export DOWNLOAD_HOME="$__ECLIPSE_DOCUMENT_ROOT/$__DOWNLOAD_PATH"
-export DOWNLOAD_URL="http://$__DOWNLOAD_PATH"
+export DOWNLOAD_HOME="${__ECLIPSE_DOCUMENT_ROOT}/${__DOWNLOAD_PATH}"
+export DOWNLOAD_URL="http://${__DOWNLOAD_PATH}"
 
 # Computed from above
-export UPDATE_PATH="$__DOWNLOAD_PATH/$__UPDATE_FOLDER"
-export UPDATE_HOME="$DOWNLOAD_HOME/$__UPDATE_FOLDER"
-export UPDATE_URL="$DOWNLOAD_URL/$__UPDATE_FOLDER"
+export UPDATE_PATH="${__DOWNLOAD_PATH}/${__UPDATE_FOLDER}"
+export UPDATE_HOME="${DOWNLOAD_HOME}/${__UPDATE_FOLDER}"
+export UPDATE_URL="${DOWNLOAD_URL}/${__UPDATE_FOLDER}"
 
-export UPDATE_NIGHTLY_PATH="$UPDATE_PATH/$__NIGHTLY_FOLDER"
-export UPDATE_NIGHTLY_HOME="$UPDATE_HOME/$__NIGHTLY_FOLDER"
-export UPDATE_NIGHTLY_URL="$UPDATE_URL/$__NIGHTLY_FOLDER"
+export UPDATE_NIGHTLY_PATH="${UPDATE_PATH}/${__NIGHTLY_FOLDER}"
+export UPDATE_NIGHTLY_HOME="${UPDATE_HOME}/${__NIGHTLY_FOLDER}"
+export UPDATE_NIGHTLY_URL="${UPDATE_URL}/${__NIGHTLY_FOLDER}"
 
-export UPDATE_INTEGRATION_PATH="$UPDATE_PATH/$__INTEGRATION_FOLDER"
-export UPDATE_INTEGRATION_HOME="$UPDATE_HOME/$__INTEGRATION_FOLDER"
-export UPDATE_INTEGRATION_URL="$UPDATE_URL/$__INTEGRATION_FOLDER"
+export UPDATE_INTEGRATION_PATH="${UPDATE_PATH}/${__INTEGRATION_FOLDER}"
+export UPDATE_INTEGRATION_HOME="${UPDATE_HOME}/${__INTEGRATION_FOLDER}"
+export UPDATE_INTEGRATION_URL="${UPDATE_URL}/${__INTEGRATION_FOLDER}"
 
-export UPDATE_RELEASES_PATH="$UPDATE_PATH/$__RELEASES_FOLDER"
-export UPDATE_RELEASES_HOME="$UPDATE_HOME/$__RELEASES_FOLDER"
-export UPDATE_RELEASES_URL="$UPDATE_URL/$__RELEASES_FOLDER"
+export UPDATE_RELEASES_PATH="${UPDATE_PATH}/${__RELEASES_FOLDER}"
+export UPDATE_RELEASES_HOME="${UPDATE_HOME}/${__RELEASES_FOLDER}"
+export UPDATE_RELEASES_URL="${UPDATE_URL}/${__RELEASES_FOLDER}"
 
-export UPDATE_STAGING_PATH="$UPDATE_PATH/$__STAGING_FOLDER"
-export UPDATE_STAGING_HOME="$UPDATE_HOME/$__STAGING_FOLDER"
-export UPDATE_STAGING_URL="$UPDATE_URL/$__STAGING_FOLDER"
+export UPDATE_STAGING_PATH="${UPDATE_PATH}/${__STAGING_FOLDER}"
+export UPDATE_STAGING_HOME="${UPDATE_HOME}/${__STAGING_FOLDER}"
+export UPDATE_STAGING_URL="${UPDATE_URL}/${__STAGING_FOLDER}"
 
-export UPDATE_MAINTENANCE_PATH="$UPDATE_PATH/$__MAINTENANCE_FOLDER"
-export UPDATE_MAINTENANCE_HOME="$UPDATE_HOME/$__MAINTENANCE_FOLDER"
-export UPDATE_MAINTENANCE_URL="$UPDATE_URL/$__MAINTENANCE_FOLDER"
+export UPDATE_MAINTENANCE_PATH="${UPDATE_PATH}/${__MAINTENANCE_FOLDER}"
+export UPDATE_MAINTENANCE_HOME="${UPDATE_HOME}/${__MAINTENANCE_FOLDER}"
+export UPDATE_MAINTENANCE_URL="${UPDATE_URL}/${__MAINTENANCE_FOLDER}"
 
-export UPDATE_MILESTONES_PATH="$UPDATE_PATH/$__MILESTONES_FOLDER"
-export UPDATE_MILESTONES_HOME="$UPDATE_HOME/$__MILESTONES_FOLDER"
-export UPDATE_MILESTONES_URL="$UPDATE_URL/$__MILESTONES_FOLDER"
\ No newline at end of file
+export UPDATE_MILESTONES_PATH="${UPDATE_PATH}/${__MILESTONES_FOLDER}"
+export UPDATE_MILESTONES_HOME="${UPDATE_HOME}/${__MILESTONES_FOLDER}"
+export UPDATE_MILESTONES_URL="${UPDATE_URL}/${__MILESTONES_FOLDER}"
diff --git a/hudson-scripts/init/1_p2.sh b/hudson-scripts/init/1_p2.sh
index a06e373..24977ee 100644
--- a/hudson-scripts/init/1_p2.sh
+++ b/hudson-scripts/init/1_p2.sh
@@ -12,17 +12,17 @@
 
 P2_ADMIN_VERSION="1.1.0"
 
-if [[ "$OSTYPE" == "linux"* || "$OSTYPE" == "freebsd"* ]]; then
+if [[ "${OSTYPE}" == "linux"* || "${OSTYPE}" == "freebsd"* ]]; then
 	OSWS="linux.gtk"
 	FILE_EXT="tar.gz"
-elif [[ "$OSTYPE" == "cygwin"* ]]; then
+elif [[ "${OSTYPE}" == "cygwin"* ]]; then
 	OSWS="win32.win32"
 	FILE_EXT="zip"
-elif [[ "$OSTYPE" == "darwin"* ]]; then
+elif [[ "${OSTYPE}" == "darwin"* ]]; then
 	OSWS="macosx.cocoa"
 	FILE_EXT="tar.gz"
 else
-	LSCRITICAL "Unknown 'OSTYPE'=$OSTYPE."
+	LSCRITICAL "Unknown 'OSTYPE'=${OSTYPE}."
 	exit -1
 fi
 
@@ -33,7 +33,7 @@
 fi
 
 PLATFORM_SPECIFIER="${OSWS}.${ARCH}"
-LSDEBUG "Platform specifier is '$PLATFORM_SPECIFIER'"
+LSDEBUG "Platform specifier is '${PLATFORM_SPECIFIER}'"
 P2_ADMIN_ARCHIVE="p2-admin-${P2_ADMIN_VERSION}-${PLATFORM_SPECIFIER}.${FILE_EXT}"
 P2_ADMIN_URL="https://github.com/mbarbero/p2-admin/releases/download/v${P2_ADMIN_VERSION}/${P2_ADMIN_ARCHIVE}"
 
@@ -44,8 +44,8 @@
 
 if [ ! -f "${P2_ADMIN_ARCHIVE}" ]; then
 	LSDEBUG "Unable to find p2-admin archive '${P2_ADMIN_ARCHIVE}'"
-	LSINFO "Downloading p2-admin '$P2_ADMIN_URL'"
-	wget -q --no-check-certificate $P2_ADMIN_URL -O - > "${P2_ADMIN_ARCHIVE}"
+	LSINFO "Downloading p2-admin '${P2_ADMIN_URL}'"
+	wget -q --no-check-certificate ${P2_ADMIN_URL} -O - > "${P2_ADMIN_ARCHIVE}"
 fi
 
 LSINFO "Unziping '${P2_ADMIN_ARCHIVE}'"
@@ -54,30 +54,30 @@
 LSINFO "Defining p2 aliases"
 shopt -s expand_aliases
 
-LSDEBUG "composite-repository='p2-admin/p2-admin -vm $JAVA_HOME/bin/java -application org.eclipselabs.equinox.p2.composite.repository'"
-alias composite-repository="p2-admin/p2-admin -vm $JAVA_HOME/bin/java -application org.eclipselabs.equinox.p2.composite.repository"
+LSDEBUG "composite-repository='p2-admin/p2-admin -vm ${JAVA_HOME}/bin/java -application org.eclipselabs.equinox.p2.composite.repository'"
+alias composite-repository="p2-admin/p2-admin -vm ${JAVA_HOME}/bin/java -application org.eclipselabs.equinox.p2.composite.repository"
 
 # Create a p2 index file for composite repositories
 createP2Index() {
-	LSDEBUG "Creating p2.index file in $1"
-	cat > "$1/p2.index" <<EOF
+	LSDEBUG "Creating p2.index file in ${1}"
+	cat > "${1}/p2.index" <<EOF
 version = 1
 metadata.repository.factory.order = compositeContent.xml,\!
 artifact.repository.factory.order = compositeArtifacts.xml,\!
 EOF
 }
 
-# Remove any previous file from the $1 path and create a composite repository with a single
-# child ($2). The composite will be name $3.
+# Remove any previous file from the ${1} path and create a composite repository with a single
+# child (${2}). The composite will be name ${3}.
 createRedirect() {
-	local from="$1"
-	local to="$2"
-	local name="$3"
+	local from="${1}"
+	local to="${2}"
+	local name="${3}"
 	
-	LSDEBUG "Creating redirection from '$name'@'$from' to '$to'"
-	mkdir -p "$from"
-	rm -f "$from/compositeArtifacts."*
-	rm -f "$from/compositeContent."*
-	composite-repository -location "$from" -add "$to" -repositoryName "$name" -compressed
-	createP2Index $from
+	LSDEBUG "Creating redirection from '${name}'@'${from}' to '${to}'"
+	mkdir -p "${from}"
+	rm -f "${from}/compositeArtifacts."*
+	rm -f "${from}/compositeContent."*
+	composite-repository -location "${from}" -add "${to}" -repositoryName "${name}" -compressed
+	createP2Index ${from}
 }
diff --git a/hudson-scripts/init/_0_log.sh b/hudson-scripts/init/_0_log.sh
index ae99ed3..5f447ae 100644
--- a/hudson-scripts/init/_0_log.sh
+++ b/hudson-scripts/init/_0_log.sh
@@ -26,7 +26,7 @@
 
 LS_OUTPUT=${LS_OUTPUT:-/dev/stdout}
 # XXX need more flexible templating, currently manual padding for level names
-#LS_DEFAULT_FMT=${LS_DEFAULT_FMT:-'[$_LS_LEVEL_STR][${FUNCNAME[1]}:${BASH_LINENO[0]}]'}
+#LS_DEFAULT_FMT=${LS_DEFAULT_FMT:-'[${_LS_LEVEL_STR}][${FUNCNAME[1]}:${BASH_LINENO[0]}]'}
 LS_DEFAULT_FMT=${LS_DEFAULT_FMT:-'%-10s %s [%s:%s]\n'}
 
 LS_DEBUG_LEVEL=10
@@ -34,23 +34,23 @@
 LS_WARNING_LEVEL=30
 LS_ERROR_LEVEL=40
 LS_CRITICAL_LEVEL=50
-LS_LEVEL=${LS_LEVEL:-$LS_DEBUG_LEVEL}
+LS_LEVEL=${LS_LEVEL:-${LS_DEBUG_LEVEL}}
 # LS_LEVELS structure:
 # Level, Level Name, Level Format, Before Log Entry, After Log Entry
 LS_LEVELS=(
-  $LS_DEBUG_LEVEL    '[DEBUG]'    '\e[0;32m'    '\e[0m'
-  $LS_INFO_LEVEL     '[INFO]'     '\e[0;34m'    '\e[0m'
-  $LS_WARNING_LEVEL  '[WARNING]'  '\e[0;33m'    '\e[0m'
-  $LS_ERROR_LEVEL    '[ERROR]'    '\e[0;31m'    '\e[0m'
-  $LS_CRITICAL_LEVEL '[CRITICAL]' '\e[0;37;41m' '\e[0m'
+  ${LS_DEBUG_LEVEL}    '[DEBUG]'    '\e[0;32m'    '\e[0m'
+  ${LS_INFO_LEVEL}     '[INFO]'     '\e[0;34m'    '\e[0m'
+  ${LS_WARNING_LEVEL}  '[WARNING]'  '\e[0;33m'    '\e[0m'
+  ${LS_ERROR_LEVEL}    '[ERROR]'    '\e[0;31m'    '\e[0m'
+  ${LS_CRITICAL_LEVEL} '[CRITICAL]' '\e[0;37;41m' '\e[0m'
 )
 
 _LS_FIND_LEVEL_STR () {
-  local LEVEL=$1
+  local LEVEL=${1}
   local i
-  _LS_LEVEL_STR="$LEVEL"
+  _LS_LEVEL_STR="${LEVEL}"
   for ((i=0; i<${#LS_LEVELS[@]}; i+=4)); do
-    if [[ "$LEVEL" == "${LS_LEVELS[i]}" ]]; then
+    if [[ "${LEVEL}" == "${LS_LEVELS[i]}" ]]; then
       _LS_LEVEL_STR="${LS_LEVELS[i+1]}"
       #_LS_LEVEL_BEGIN="${LS_LEVELS[i+2]}"
       #_LS_LEVEL_END="${LS_LEVELS[i+3]}"
@@ -63,16 +63,16 @@
 }
 
 # General logging function
-# $1: Level
+# ${1}: Level
 LSLOG () {
-  local LEVEL=$1
+  local LEVEL=${1}
   shift
   (( LEVEL < LS_LEVEL )) && return 1
-  _LS_FIND_LEVEL_STR $LEVEL
+  _LS_FIND_LEVEL_STR ${LEVEL}
   # if no message was passed, read it from STDIN
   local _MSG
   [[ $# -ne 0 ]] && _MSG="$@" || _MSG="$(cat)"
-  printf "$LS_DEFAULT_FMT" "$_LS_LEVEL_STR" "$_MSG" "$(basename ${BASH_SOURCE[1]})" "${BASH_LINENO[0]}" >> "$LS_OUTPUT"
+  printf "${LS_DEFAULT_FMT}" "${_LS_LEVEL_STR}" "${_MSG}" "$(basename ${BASH_SOURCE[1]})" "${BASH_LINENO[0]}" >> "${LS_OUTPUT}"
 }
 
 shopt -s expand_aliases
diff --git a/hudson-scripts/init/_1_trap.sh b/hudson-scripts/init/_1_trap.sh
index 63a4e80..abe7e1d 100644
--- a/hudson-scripts/init/_1_trap.sh
+++ b/hudson-scripts/init/_1_trap.sh
@@ -18,20 +18,20 @@
 	LSDEBUG "Program will exit, saving the environment variables to a file for later debugging"
 	env | sort > env.txt
 
-	if [ $RETURN -ne 0 -a $RETURN -lt 129 -o $RETURN -gt 165 ]; then
+	if [ ${RETURN} -ne 0 -a ${RETURN} -lt 129 -o ${RETURN} -gt 165 ]; then
 		cd "${_ON_LOAD_PWD}"
 		LSCRITICAL "An error occurred"
 		LSLOGSTACK
 	fi
 
-	exit $RETURN
+	exit ${RETURN}
 }
 
 __onInterruption() {
 	local RETURN=$?
 	LSDEBUG "Program has been interrupted"
-	exit $RETURN
+	exit ${RETURN}
 }
 
 trap __onInterruption INT TERM
-trap __onExit EXIT
\ No newline at end of file
+trap __onExit EXIT
diff --git a/hudson-scripts/publish-nightly.sh b/hudson-scripts/publish-nightly.sh
index 4d6c7e0..ee062f5 100755
--- a/hudson-scripts/publish-nightly.sh
+++ b/hudson-scripts/publish-nightly.sh
@@ -10,7 +10,7 @@
 #    Obeo - initial API and implementation
 # ====================================================================
 
-[ -z "$GIT_BRANCH" -o -z "$UPDATE_SITE__ARTIFACT_URL" -o -z "$UPDATE_SITE__ARTIFACT_NAME" -o -z "$UPDATE_SITE__UNQUALIFIED_VERSION" -o -z "$UPDATE_SITE__QUALIFIED_VERSION" ] && {
+[ -z "${GIT_BRANCH}" -o -z "${UPDATE_SITE__ARTIFACT_URL}" -o -z "${UPDATE_SITE__ARTIFACT_NAME}" -o -z "${UPDATE_SITE__UNQUALIFIED_VERSION}" -o -z "${UPDATE_SITE__QUALIFIED_VERSION}" ] && {
      echo "Execution aborted.
 
 One or more of the required variables is not set. They are normally
@@ -25,66 +25,66 @@
     exit 1
 }
 
-source "$(dirname "$0")/init.sh"
+source "$(dirname "${0}")/init.sh"
 
-LSINFO "Publishing nightly build ($UPDATE_SITE__QUALIFIED_VERSION) of $PROJECT_NAME"
+LSINFO "Publishing nightly build (${UPDATE_SITE__QUALIFIED_VERSION}) of ${PROJECT_NAME}"
 
 # the update site
 
 for zip in *.zip;
 do
-	LSDEBUG "Removing previous zipped update site '$zip'"
-	rm -f $zip
+	LSDEBUG "Removing previous zipped update site '${zip}'"
+	rm -f ${zip}
 done 
 
-LSINFO "Downloading '$UPDATE_SITE__ARTIFACT_URL'"
-wget -q --no-check-certificate $UPDATE_SITE__ARTIFACT_URL -O - > $UPDATE_SITE__ARTIFACT_NAME
+LSINFO "Downloading '${UPDATE_SITE__ARTIFACT_URL}'"
+wget -q --no-check-certificate ${UPDATE_SITE__ARTIFACT_URL} -O - > ${UPDATE_SITE__ARTIFACT_NAME}
 
-STREAM="$(echo $UPDATE_SITE__UNQUALIFIED_VERSION | sed-regex 's/^([0-9]+\.[0-9]+)\.[0-9]+$/\1/').x"
-LSDEBUG "Stream name is '$STREAM'"
+STREAM="$(echo ${UPDATE_SITE__UNQUALIFIED_VERSION} | sed-regex 's/^([0-9]+\.[0-9]+)\.[0-9]+$/\1/').x"
+LSDEBUG "Stream name is '${STREAM}'"
 
-if [ -d $UPDATE_SITE__QUALIFIED_VERSION ];then
-	LSDEBUG "Removing folder '$UPDATE_SITE__QUALIFIED_VERSION'"
-	rm -rf $UPDATE_SITE__QUALIFIED_VERSION
+if [ -d ${UPDATE_SITE__QUALIFIED_VERSION} ];then
+	LSDEBUG "Removing folder '${UPDATE_SITE__QUALIFIED_VERSION}'"
+	rm -rf ${UPDATE_SITE__QUALIFIED_VERSION}
 fi
-LSDEBUG "Unziping '$UPDATE_SITE__ARTIFACT_NAME'"
-unzip -qq $UPDATE_SITE__ARTIFACT_NAME -d $UPDATE_SITE__QUALIFIED_VERSION
+LSDEBUG "Unziping '${UPDATE_SITE__ARTIFACT_NAME}'"
+unzip -qq ${UPDATE_SITE__ARTIFACT_NAME} -d ${UPDATE_SITE__QUALIFIED_VERSION}
 
-if [ ! -d $UPDATE_NIGHTLY_HOME ]; then
-	LSDEBUG "Creating folder '$UPDATE_NIGHTLY_HOME'"
-	mkdir -p $UPDATE_NIGHTLY_HOME
+if [ ! -d ${UPDATE_NIGHTLY_HOME} ]; then
+	LSDEBUG "Creating folder '${UPDATE_NIGHTLY_HOME}'"
+	mkdir -p ${UPDATE_NIGHTLY_HOME}
 fi
-LSINFO "Copying update site to '$UPDATE_NIGHTLY_HOME'"
-cp -rf $UPDATE_SITE__QUALIFIED_VERSION $UPDATE_NIGHTLY_HOME
+LSINFO "Copying update site to '${UPDATE_NIGHTLY_HOME}'"
+cp -rf ${UPDATE_SITE__QUALIFIED_VERSION} ${UPDATE_NIGHTLY_HOME}
 
 ## stream update
 
-LSINFO "Adding '$UPDATE_NIGHTLY_URL/$UPDATE_SITE__QUALIFIED_VERSION' to '$UPDATE_NIGHTLY_HOME/$STREAM'"
+LSINFO "Adding '${UPDATE_NIGHTLY_URL}/${UPDATE_SITE__QUALIFIED_VERSION}' to '${UPDATE_NIGHTLY_HOME}/${STREAM}'"
 composite-repository \
-	-location "$UPDATE_NIGHTLY_HOME/$STREAM" \
-	-add "$UPDATE_NIGHTLY_URL/$UPDATE_SITE__QUALIFIED_VERSION" \
-	-repositoryName "$PROJECT_NAME $STREAM nightly builds" \
+	-location "${UPDATE_NIGHTLY_HOME}/${STREAM}" \
+	-add "${UPDATE_NIGHTLY_URL}/${UPDATE_SITE__QUALIFIED_VERSION}" \
+	-repositoryName "${PROJECT_NAME} ${STREAM} nightly builds" \
 	-compressed
-createP2Index "$UPDATE_NIGHTLY_HOME/$STREAM"
+createP2Index "${UPDATE_NIGHTLY_HOME}/${STREAM}"
 
-LSINFO "Creating redirection from '$UPDATE_NIGHTLY_HOME/$STREAM/latest' to '$UPDATE_NIGHTLY_URL/$UPDATE_SITE__QUALIFIED_VERSION'"
-createRedirect "$UPDATE_NIGHTLY_HOME/$STREAM/latest" "$UPDATE_NIGHTLY_URL/$UPDATE_SITE__QUALIFIED_VERSION" "$PROJECT_NAME $STREAM latest nightly build"
+LSINFO "Creating redirection from '${UPDATE_NIGHTLY_HOME}/${STREAM}/latest' to '${UPDATE_NIGHTLY_URL}/${UPDATE_SITE__QUALIFIED_VERSION}'"
+createRedirect "${UPDATE_NIGHTLY_HOME}/${STREAM}/latest" "${UPDATE_NIGHTLY_URL}/${UPDATE_SITE__QUALIFIED_VERSION}" "${PROJECT_NAME} ${STREAM} latest nightly build"
 
 ## all updates
 
-LSINFO "Adding '$UPDATE_NIGHTLY_URL/$UPDATE_SITE__QUALIFIED_VERSION' to '$UPDATE_NIGHTLY_HOME'"
+LSINFO "Adding '${UPDATE_NIGHTLY_URL}/${UPDATE_SITE__QUALIFIED_VERSION}' to '${UPDATE_NIGHTLY_HOME}'"
 composite-repository \
-	-location "$UPDATE_NIGHTLY_HOME" \
-	-add "$UPDATE_NIGHTLY_URL/$UPDATE_SITE__QUALIFIED_VERSION" \
-	-repositoryName "$PROJECT_NAME nightly builds" \
+	-location "${UPDATE_NIGHTLY_HOME}" \
+	-add "${UPDATE_NIGHTLY_URL}/${UPDATE_SITE__QUALIFIED_VERSION}" \
+	-repositoryName "${PROJECT_NAME} nightly builds" \
 	-compressed
-createP2Index "$UPDATE_NIGHTLY_HOME"
+createP2Index "${UPDATE_NIGHTLY_HOME}"
 
-if [ $GIT_BRANCH = "master" ]; then
-	LSINFO "On master branch, then create redirection from '$UPDATE_NIGHTLY_HOME/latest' to '$UPDATE_NIGHTLY_URL/$UPDATE_SITE__QUALIFIED_VERSION'"
-	createRedirect "$UPDATE_NIGHTLY_HOME/latest" "$UPDATE_NIGHTLY_URL/$UPDATE_SITE__QUALIFIED_VERSION" "$PROJECT_NAME latest nightly build"
+if [ ${GIT_BRANCH} = "master" ]; then
+	LSINFO "On master branch, then create redirection from '${UPDATE_NIGHTLY_HOME}/latest' to '${UPDATE_NIGHTLY_URL}/${UPDATE_SITE__QUALIFIED_VERSION}'"
+	createRedirect "${UPDATE_NIGHTLY_HOME}/latest" "${UPDATE_NIGHTLY_URL}/${UPDATE_SITE__QUALIFIED_VERSION}" "${PROJECT_NAME} latest nightly build"
 fi
 
 # the javadoc
 
-# the documentation
\ No newline at end of file
+# the documentation