From 8d741e566e9687abd6102fdd5ecae84fa3ba9f6f Mon Sep 17 00:00:00 2001 From: Nedko Arnaudov Date: Wed, 1 Mar 2023 00:46:01 +0200 Subject: [PATCH] Disable gitcommit.sh --- gitcommit.sh | 7 ++++--- setup.py | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gitcommit.sh b/gitcommit.sh index 3b90802..8efca2e 100755 --- a/gitcommit.sh +++ b/gitcommit.sh @@ -1,6 +1,7 @@ #!/bin/sh -COMMIT=`git log --color=never -1 --oneline | cut -d" " -f1` -DATE=`git log --color=never -1 --date=iso | sed -ne "s/Date:\s\+\(.*\).*/\1/p" | cut -d" " -f1 | tr -d "-"` +#COMMIT=`git log --color=never -1 --oneline | cut -d" " -f1` +#DATE=`git log --color=never -1 --date=iso | sed -ne "s/Date:\s\+\(.*\).*/\1/p" | cut -d" " -f1 | tr -d "-"` -echo "$DATE".git"$COMMIT" +#echo "$DATE".git"$COMMIT" +git describe --tags diff --git a/setup.py b/setup.py index 7560581..5c44fde 100755 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ from distutils.command.clean import clean from DistUtilsExtra.command import * laditools_version = "1.0" -get_commit_script = "gitcommit.sh" +#get_commit_script = "gitcommit.sh" pkg_short_desc = "Linux Audio Desktop Integration Tools" pkg_long_desc = """LADITools is a set of tools aiming to achieve the goals of the LADI project to improve desktop integration and user workflow of Linux audio system based on JACK and ladish. Those tools take advantage of the D-Bus interfaces recently added to JACK and ladish to ease the configuration and use of those two great softwares. @@ -51,10 +51,10 @@ pkg_scripts = ['g15ladi', os.environ['XGETTEXT_ARGS'] = "--language=Python" -if not os.getenv("LADI_RELEASE") and \ - os.path.isfile(get_commit_script): - commit = subprocess.check_output(["sh", get_commit_script]).strip() - laditools_version += "~" + str(commit) +#if not os.getenv("LADI_RELEASE") and \ +# os.path.isfile(get_commit_script): +# commit = subprocess.check_output(["sh", get_commit_script]).strip() +# laditools_version += "~" + str(commit) iconsizelist = "16 22 24 32 48 64 96 128 256".split()