From 6049c9cde947e08f4688f41bd224f742e68e73c8 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 19 Dec 2010 11:08:13 +0100
Subject: [PATCH] scripts/image: fix version string for release

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 config/functions | 4 +++-
 scripts/image    | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/config/functions b/config/functions
index 3b61da0767..f6a27ed136 100644
--- a/config/functions
+++ b/config/functions
@@ -106,8 +106,10 @@ add_group() {
 }
 
 get_version() {
+
+  BUILD_DATE=`date +%Y%m%d`
+
   if [ "$OPENELEC_VERSION" = devel -o "$OPENELEC_VERSION" = debug ]; then
-    BUILD_DATE=`date +%Y%m%d`
     GIT_BUILD=`git log --pretty=format:'' | wc -l`
     OPENELEC_VERSION=$OPENELEC_VERSION-$BUILD_DATE-r$GIT_BUILD
   fi
diff --git a/scripts/image b/scripts/image
index 92d5870c1d..2677dfcecd 100755
--- a/scripts/image
+++ b/scripts/image
@@ -42,9 +42,14 @@ mkdir -p $INSTALL
   echo "$DISTRONAME" > $INSTALL/etc/distribution
   echo "$PROJECT.$TARGET_ARCH" > $INSTALL/etc/arch
   echo "$OPENELEC_VERSION" > $INSTALL/etc/version
-  echo "$DISTRONAME - Date of build: $BUILD_DATE Build: $GIT_BUILD" > $INSTALL/etc/openelec-release
   echo "$TARGET_VERSION" > $INSTALL/etc/release
 
+  if [ "$OPENELEC_VERSION" = devel -o "$OPENELEC_VERSION" = debug ]; then
+    echo "$DISTRONAME - Date of build: $BUILD_DATE Build: $GIT_BUILD" > $INSTALL/etc/openelec-release
+  else
+    echo "$DISTRONAME - Date of build: $BUILD_DATE Version: $OPENELEC_VERSION" > $INSTALL/etc/openelec-release
+  fi
+
 # copy project related files to filesystem
   if [ -d "$PROJECT_DIR/$PROJECT/filesystem" ]; then
     cp -PR $PROJECT_DIR/$PROJECT/filesystem/* $INSTALL