From 0cb534116da2ae4ade289c2be023fc05f581e4c0 Mon Sep 17 00:00:00 2001
From: William Petit <wpetit@cadoles.com>
Date: Wed, 18 Nov 2015 10:45:20 +0100
Subject: [PATCH] Base default opts

---
 hooks/05-create-changelog-prebuild           | 13 ++-----------
 hooks/07-add-package-version-suffix-prebuild | 19 +++++++++++++++++++
 hooks/07-bump-package-version-prebuild       | 15 ---------------
 package                                      |  4 ++--
 4 files changed, 23 insertions(+), 28 deletions(-)
 create mode 100755 hooks/07-add-package-version-suffix-prebuild
 delete mode 100755 hooks/07-bump-package-version-prebuild

diff --git a/hooks/05-create-changelog-prebuild b/hooks/05-create-changelog-prebuild
index 07ffa20..6ca58dc 100755
--- a/hooks/05-create-changelog-prebuild
+++ b/hooks/05-create-changelog-prebuild
@@ -47,16 +47,7 @@ do
   distribution=$(get_opt distribution UNRELEASED)
   urgency=$(get_opt urgency low)
 
-  commit_count=$(git rev-list --count --first-parent HEAD)
-  current_commit=$(git log -n 1 --pretty=format:"%h")
-  version_suffix=tamarin${commit_count}~${current_commit}
-  package_version=${version}-${version_suffix}
-
-  # Define package_version opt if not defined
-  if [ -z "$(get_opt package_version)" ]; then
-      # Share computed package version
-      set_opt package_version "${package_version}"
-  fi
+  package_version=${version}
 
   # Define project_version opt if not defined
   if [ -z "$(get_opt project_version)" ]; then
@@ -64,7 +55,7 @@ do
       set_opt project_version "${version}"
   fi
 
-  echo "${project_name} (${package_version}) ${distribution}; urgency=${urgency}" >> debian/changelog
+  echo "${project_name} (${version}) ${distribution}; urgency=${urgency}" >> debian/changelog
 
   echo >> debian/changelog
 
diff --git a/hooks/07-add-package-version-suffix-prebuild b/hooks/07-add-package-version-suffix-prebuild
new file mode 100755
index 0000000..7905074
--- /dev/null
+++ b/hooks/07-add-package-version-suffix-prebuild
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+source "${TAMARIN_UTIL}"
+
+if [ ! -f debian/changelog ]; then
+  info "No changelog. Skipping..."
+  exit
+fi
+
+if [ -d .git ]; then
+  info "It seems to be a Git repository. Generating version suffix based on Git history..."
+  commit_count=$(git rev-list --count HEAD)
+  current_commit=$(git log -n 1 --pretty=format:"%h")
+  version_suffix=tamarin${commit_count}~${current_commit}
+else
+  info "Not a Git project. Fallback to timestamp for suffix generation..."
+  version_suffix=tamarin$(date +%Y%m%d%H%M)
+fi
+
+sed -i "0,/(\(.*\))/s/(\(.*\))/(\1-${version_suffix})/" debian/changelog
diff --git a/hooks/07-bump-package-version-prebuild b/hooks/07-bump-package-version-prebuild
deleted file mode 100755
index 0637b5c..0000000
--- a/hooks/07-bump-package-version-prebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-source "${TAMARIN_UTIL}"
-
-if [ ! -f debian/changelog ] || [ ! -d .git ]; then
-  info "To auto calculate the package version suffix, we need a git environment and a existing changelog !"
-  exit
-fi
-
-commit_count=$(git rev-list --count --first-parent HEAD)
-current_commit=$(git log -n 1 --pretty=format:"%h")
-version_suffix=tamarin${commit_count}~${current_commit}
-
-sed "0,/(\(.*\))/s/(\(.*\))/(\1-${version_suffix})/" debian/changelog
-
-exit 1
diff --git a/package b/package
index 5dcd173..c4e8c15 100755
--- a/package
+++ b/package
@@ -58,8 +58,6 @@ function create_container {
     VOLUME /src
     VOLUME /dist
 
-    CMD /root/.tamarin/lib/build.sh ${projectName} ${BUILD_BRANCH} /tmp ${BUILD_TAG}
-
 EOF
 
   # Add default opts file if defined
@@ -70,6 +68,8 @@ EOF
 
   exec_hooks "containerbuild" "$temp_dir"
 
+  echo "CMD /root/.tamarin/lib/build.sh ${projectName} ${BUILD_BRANCH} /tmp ${BUILD_TAG}" >> "$temp_dir/Dockerfile"
+
   # Build image
   tar -C "$temp_dir" -czh . | docker build -t "$container_tag" - 2> >(stderr) 1> >(stdout)