From c61be4ed90a5d248a498565eba29cd5c98cb15f4 Mon Sep 17 00:00:00 2001 From: Bob Lightfoot Date: Thu, 19 Mar 2015 05:46:37 -0400 Subject: [PATCH] On branch Bug2720Fix Changes to be committed: modified: support/version lines 20 and 21 to correct location of rpm/version files 20150319 --- support/version | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/version b/support/version index 8c2164e9..1f0c13b0 100755 --- a/support/version +++ b/support/version @@ -17,8 +17,8 @@ if [ -d ".git" ]; then VER=$(echo $VER | sed "s/^v//" | sed "s/-\([0-9]*\)-\(g[0-9a-f]*\)/.\1~\2/") elif [ -f "$(dirname "$0")/../debian/changelog" ]; then VER=$(head -1 "$(dirname "$0")/../debian/changelog" | awk '{ print $2 }' | tr -d '()' | cut -d '-' -f 1) -elif [ -r "$(dirname "$0")/rpm/version" ]; then - VER=$(cat "$(dirname "$0")/rpm/version") +elif [ -r "$(dirname "$0")/../rpm/version" ]; then + VER=$(cat "$(dirname "$0")/../rpm/version") else VER="0.0.0~unknown" fi