diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-05-04 18:25:19 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-05-04 18:25:19 +0900 |
| commit | eb3700be2a32c737346b3cc19cce3b50e6a16700 (patch) | |
| tree | c316950cb4ee15d8aab22fe575193465dd484b6d /debian/_buildscripts/local/build_module.sh | |
| parent | 628b3b8262c617857deece3409194e4fda4d1b25 (diff) | |
| download | tde-packaging-eb3700be2a32c737346b3cc19cce3b50e6a16700.tar.gz tde-packaging-eb3700be2a32c737346b3cc19cce3b50e6a16700.zip | |
DEB build scripts:
1) updated application list.
2) fixed problem with .tdescminfo contents when branches are more recent
than master/r14.0.x.
3) fixed issue with detection of extra dependencies repository.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'debian/_buildscripts/local/build_module.sh')
| -rwxr-xr-x | debian/_buildscripts/local/build_module.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/_buildscripts/local/build_module.sh b/debian/_buildscripts/local/build_module.sh index b3a403681..b037b7d09 100755 --- a/debian/_buildscripts/local/build_module.sh +++ b/debian/_buildscripts/local/build_module.sh @@ -275,7 +275,7 @@ if [ "$bool_COPY_MOD_SRC" = "y" ]; then echo "# TDE SCM module information" > "$MOD_BUILD_PATH/.tdescminfo" echo "Name: $MOD_NAME" >> "$MOD_BUILD_PATH/.tdescminfo" cd "$MOD_GIT_PATH" - MOD_BRANCH=`git branch --contains HEAD | grep -v "no branch" | head -n1 | cut -c 3-` + MOD_BRANCH=`git rev-parse --abbrev-ref HEAD | grep -v "no branch" | head -n1` COMMIT_HASH=`git rev-parse HEAD` echo "Revision: $MOD_BRANCH-$COMMIT_HASH" >> "$MOD_BUILD_PATH/.tdescminfo" git log -1 --pretty=format:"DateTime: %cd%n" --date=format:"%m/%d/%Y %H:%M" >> "$MOD_BUILD_PATH/.tdescminfo" @@ -310,7 +310,7 @@ if [ "$bool_EXTRADEP_MOD" != "y" -a "$bool_COPY_PKGING_FILES" = "y" ]; then # Default package name # Calculate package version cd $MOD_GIT_PATH - branch=`git branch --contains HEAD | egrep -v "no branch|detached" | head -n1 | cut -c 3-` + branch=`git rev-parse --abbrev-ref HEAD | egrep -v "no branch|detached" | head -n1` target_tag=`git tag | grep -F "$TDE_RELEASE" | head -n1` tag=`git tag | \ sed "s|^\([^0-9]\)|\1.|" | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr -k 4,4nr -k 5,5nr | sed "s|^\([^0-9]\)\.|\1|" | \ |