diff options
| -rwxr-xr-x | build-debug-update.sh | 6 | ||||
| -rwxr-xr-x | build-installers.sh | 26 | ||||
| -rw-r--r-- | build-release.sh | 22 |
3 files changed, 27 insertions, 27 deletions
diff --git a/build-debug-update.sh b/build-debug-update.sh index 289c58138..6660cd38b 100755 --- a/build-debug-update.sh +++ b/build-debug-update.sh @@ -1,10 +1,10 @@ -RELEASE_TIMESTAMP=`date +%Y-%m-%d` +RELEASE_TIMESTAMP=$(date +%Y-%m-%d) -RELEASE_INC_VERSION=`cat Updates/build_version.txt` +RELEASE_INC_VERSION=$(cat Updates/build_version.txt) RELEASE_INC_VERSION=$((RELEASE_INC_VERSION+1)) RELEASE_NAME=2.0_CLI_experimental_${RELEASE_TIMESTAMP} -RELEASE_CHANGEINFO=`cat Updates/debug_changeinfo.txt` +RELEASE_CHANGEINFO=$(cat Updates/debug_changeinfo.txt) RELEASE_VERSION="2.0.0.${RELEASE_INC_VERSION}" UPDATE_ZIP_URLS=http://updates.duplicati.com/debug/duplicati.zip\;http://alt.updates.duplicati.com/debug/duplicati.zip diff --git a/build-installers.sh b/build-installers.sh index 92f0d177f..b15d102cf 100755 --- a/build-installers.sh +++ b/build-installers.sh @@ -26,10 +26,10 @@ MONO=/Library/Frameworks/Mono.framework/Commands/mono GPG=/usr/local/bin/gpg2 -ZIPFILE=`basename "$1"` -VERSION=`echo "${ZIPFILE}" | cut -d "-" -f 2 | cut -d "_" -f 1` -BUILDTYPE=`echo "${ZIPFILE}" | cut -d "-" -f 2 | cut -d "_" -f 2` -BUILDTAG_RAW=`echo "${ZIPFILE}" | cut -d "." -f 1-4 | cut -d "-" -f 2-4` +ZIPFILE=$(basename "$1") +VERSION=$(echo "${ZIPFILE}" | cut -d "-" -f 2 | cut -d "_" -f 1) +BUILDTYPE=$(echo "${ZIPFILE}" | cut -d "-" -f 2 | cut -d "_" -f 2) +BUILDTAG_RAW=$(echo "${ZIPFILE}" | cut -d "." -f 1-4 | cut -d "-" -f 2-4) BUILDTAG="${BUILDTAG_RAW//-}" RPMNAME="duplicati-${VERSION}-${BUILDTAG}.noarch.rpm" @@ -69,13 +69,13 @@ if [ -f "${GPG_KEYFILE}" ]; then echo fi - GPGDATA=`"${MONO}" "BuildTools/AutoUpdateBuilder/bin/Debug/SharpAESCrypt.exe" d "${KEYFILE_PASSWORD}" "${GPG_KEYFILE}"` + GPGDATA=$("${MONO}" "BuildTools/AutoUpdateBuilder/bin/Debug/SharpAESCrypt.exe" d "${KEYFILE_PASSWORD}" "${GPG_KEYFILE}") if [ ! $? -eq 0 ]; then echo "Decrypting GPG keyfile failed" exit 1 fi - GPGID=`echo "${GPGDATA}" | head -n 1` - GPGKEY=`echo "${GPGDATA}" | head -n 2 | tail -n 1` + GPGID=$(echo "${GPGDATA}" | head -n 1) + GPGKEY=$(echo "${GPGDATA}" | head -n 2 | tail -n 1) else echo "No GPG keyfile found, skipping gpg signatures" fi @@ -188,14 +188,14 @@ if [ -f "${AUTHENTICODE_PFXFILE}" ] && [ -f "${AUTHENTICODE_PASSWORD}" ]; then authenticode_sign() { NEST="" for hashalg in sha1 sha256; do - SIGN_MSG=`osslsigncode sign -pkcs12 "${AUTHENTICODE_PFXFILE}" -pass "${PFX_PASS}" -n "Duplicati" -i "http://www.duplicati.com" -h "${hashalg}" ${NEST} -t "http://timestamp.verisign.com/scripts/timstamp.dll" -in "$1" -out tmpfile` + SIGN_MSG=$(osslsigncode sign -pkcs12 "${AUTHENTICODE_PFXFILE}" -pass "${PFX_PASS}" -n "Duplicati" -i "http://www.duplicati.com" -h "${hashalg}" ${NEST} -t "http://timestamp.verisign.com/scripts/timstamp.dll" -in "$1" -out tmpfile) if [ "${SIGN_MSG}" != "Succeeded" ]; then echo "${SIGN_MSG}"; fi mv tmpfile "$1" NEST="-nest" done } - PFX_PASS=`"${MONO}" "BuildTools/AutoUpdateBuilder/bin/Debug/SharpAESCrypt.exe" d "${KEYFILE_PASSWORD}" "${AUTHENTICODE_PASSWORD}"` + PFX_PASS=$("${MONO}" "BuildTools/AutoUpdateBuilder/bin/Debug/SharpAESCrypt.exe" d "${KEYFILE_PASSWORD}" "${AUTHENTICODE_PASSWORD}") DECRYPT_STATUS=$? if [ "${DECRYPT_STATUS}" -ne 0 ]; then @@ -232,9 +232,9 @@ process_installer() { aws --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/$1" "s3://updates.duplicati.com/${BUILDTYPE}/$1" fi - local MD5=`md5 ${UPDATE_TARGET}/$1 | awk -F ' ' '{print $NF}'` - local SHA1=`shasum -a 1 ${UPDATE_TARGET}/$1 | awk -F ' ' '{print $1}'` - local SHA256=`shasum -a 256 ${UPDATE_TARGET}/$1 | awk -F ' ' '{print $1}'` + local MD5=$(md5 ${UPDATE_TARGET}/$1 | awk -F ' ' '{print $NF}') + local SHA1=$(shasum -a 1 ${UPDATE_TARGET}/$1 | awk -F ' ' '{print $1}') + local SHA256=$(shasum -a 256 ${UPDATE_TARGET}/$1 | awk -F ' ' '{print $1}') cat >> "./tmp/latest-installers.json" <<EOF "$2": { @@ -299,7 +299,7 @@ rm -rf "./tmp/${SIG_FOLDER}" aws --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${SIGNAME}" "s3://updates.duplicati.com/${BUILDTYPE}/${SIGNAME}" -GITHUB_TOKEN=`cat "${GITHUB_TOKEN_FILE}"` +GITHUB_TOKEN=$(cat "${GITHUB_TOKEN_FILE}") if [ "x${GITHUB_TOKEN}" == "x" ]; then echo "No GITHUB_TOKEN found in environment, you can manually upload the binaries" diff --git a/build-release.sh b/build-release.sh index 0a8bd6275..a691ddeba 100644 --- a/build-release.sh +++ b/build-release.sh @@ -1,6 +1,6 @@ -RELEASE_TIMESTAMP=`date +%Y-%m-%d` +RELEASE_TIMESTAMP=$(date +%Y-%m-%d) -RELEASE_INC_VERSION=`cat Updates/build_version.txt` +RELEASE_INC_VERSION=$(cat Updates/build_version.txt) RELEASE_INC_VERSION=$((RELEASE_INC_VERSION+1)) if [ "x$1" == "x" ]; then @@ -95,7 +95,7 @@ if [ "z${KEYFILE_PASSWORD}" == "z" ]; then exit 0 fi -RELEASE_CHANGEINFO_NEWS=`cat "${RELEASE_CHANGELOG_NEWS_FILE}"` +RELEASE_CHANGEINFO_NEWS=$(cat "${RELEASE_CHANGELOG_NEWS_FILE}") git stash save "${GIT_STASH_NAME}" @@ -115,7 +115,7 @@ echo "${RELEASE_TYPE}" > "Duplicati/Library/AutoUpdater/AutoUpdateBuildChannel.t echo "${UPDATE_MANIFEST_URLS}" > "Duplicati/Library/AutoUpdater/AutoUpdateURL.txt" cp "Updates/release_key.txt" "Duplicati/Library/AutoUpdater/AutoUpdateSignKey.txt" -RELEASE_CHANGEINFO=`cat ${RELEASE_CHANGELOG_FILE}` +RELEASE_CHANGEINFO=$(cat ${RELEASE_CHANGELOG_FILE}) if [ "x${RELEASE_CHANGEINFO}" == "x" ]; then echo "No information in changeinfo file" exit 0 @@ -199,14 +199,14 @@ if [ -f "${AUTHENTICODE_PFXFILE}" ] && [ -f "${AUTHENTICODE_PASSWORD}" ]; then authenticode_sign() { NEST="" for hashalg in sha1 sha256; do - SIGN_MSG=`osslsigncode sign -pkcs12 "${AUTHENTICODE_PFXFILE}" -pass "${PFX_PASS}" -n "Duplicati" -i "http://www.duplicati.com" -h "${hashalg}" ${NEST} -t "http://timestamp.verisign.com/scripts/timstamp.dll" -in "$1" -out tmpfile` + SIGN_MSG=$(osslsigncode sign -pkcs12 "${AUTHENTICODE_PFXFILE}" -pass "${PFX_PASS}" -n "Duplicati" -i "http://www.duplicati.com" -h "${hashalg}" ${NEST} -t "http://timestamp.verisign.com/scripts/timstamp.dll" -in "$1" -out tmpfile) if [ "${SIGN_MSG}" != "Succeeded" ]; then echo "${SIGN_MSG}"; fi mv tmpfile "$1" NEST="-nest" done } - PFX_PASS=`"${MONO}" "BuildTools/AutoUpdateBuilder/bin/Debug/SharpAESCrypt.exe" d "${KEYFILE_PASSWORD}" "${AUTHENTICODE_PASSWORD}"` + PFX_PASS=$("${MONO}" "BuildTools/AutoUpdateBuilder/bin/Debug/SharpAESCrypt.exe" d "${KEYFILE_PASSWORD}" "${AUTHENTICODE_PASSWORD}") DECRYPT_STATUS=$? if [ "${DECRYPT_STATUS}" -ne 0 ]; then @@ -263,9 +263,9 @@ aws --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${RELEASE_FILE_NAME}.mani aws --profile=duplicati-upload s3 cp "s3://updates.duplicati.com/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.manifest" "s3://updates.duplicati.com/${RELEASE_TYPE}/latest.manifest" -ZIP_MD5=`md5 ${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip | awk -F ' ' '{print $NF}'` -ZIP_SHA1=`shasum -a 1 ${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip | awk -F ' ' '{print $1}'` -ZIP_SHA256=`shasum -a 256 ${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip | awk -F ' ' '{print $1}'` +ZIP_MD5=$(md5 ${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip | awk -F ' ' '{print $NF}') +ZIP_SHA1=$(shasum -a 1 ${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip | awk -F ' ' '{print $1}') +ZIP_SHA256=$(shasum -a 256 ${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip | awk -F ' ' '{print $1}') cat > "latest.json" <<EOF { @@ -311,11 +311,11 @@ if [ "${RELEASE_TYPE}" == "stable" ]; then PRE_RELEASE_LABEL="" fi -RELEASE_MESSAGE=`printf "Changes in this version:\n${RELEASE_CHANGEINFO_NEWS}"` +RELEASE_MESSAGE=$(printf "Changes in this version:\n${RELEASE_CHANGEINFO_NEWS}") # Using the tool from https://github.com/aktau/github-release -GITHUB_TOKEN=`cat "${GITHUB_TOKEN_FILE}"` +GITHUB_TOKEN=$(cat "${GITHUB_TOKEN_FILE}") if [ "x${GITHUB_TOKEN}" == "x" ]; then echo "No GITHUB_TOKEN found in environment, you can manually upload the binaries" |