diff --git a/CHANGELOG b/CHANGELOG index e7646d8..e6df35c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,10 @@ vX.X.X (unreleased) =================== * Placeholder for next release +v1.4.2 (2017-10-30) +=================== + * Remove VERSION file and hardcode it directly in the script. + v1.4.1 (2017-10-04) =================== * Show program versions in output. diff --git a/VERSION b/VERSION deleted file mode 100644 index 66d62a8..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -v1.4.1 diff --git a/duplicity-backup.sh b/duplicity-backup.sh index 739fab3..a99ab06 100755 --- a/duplicity-backup.sh +++ b/duplicity-backup.sh @@ -45,6 +45,8 @@ CONFIG="duplicity-backup.conf" # Script Happens Below This Line - Shouldn't Require Editing # ############################################################## +DBSH_VERSION="v1.4.2" + # make a backup of stdout and stderr for later exec 6>&1 exec 7>&2 @@ -130,19 +132,6 @@ version_compare() { version_compare "${DUPLICITY_VERSION}" 0.7 case $? in 2) LT07=1;; *) LT07=0;; esac -# Read the version string from the file named VERSION in the same directory as the script. -if [[ "$(uname)" == "Darwin" ]]; then - DBSH_VERPATH="$(dirname "$(readlink "$0")")/VERSION" -else - DBSH_VERPATH="$(dirname "$(readlink -f "$0")")/VERSION" -fi - -if [ -r "${DBSH_VERPATH}" ]; then - DBSH_VERSION=$(<"${DBSH_VERPATH}") -else - DBSH_VERSION=unknown -fi - version(){ echo "duplicity-backup.sh ${DBSH_VERSION}" echo "duplicity ${DUPLICITY_VERSION}"