diff options
| author | Badlop <badlop@process-one.net> | 2022-04-22 20:30:23 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2022-05-04 02:39:15 +0200 |
| commit | 985fa2413038864cbbf5962fc9bb7cbcae388fc8 (patch) | |
| tree | 1e86dbd0129f6161355b65d6915150901b4271c3 | |
| parent | Create uninstall.txt with instructions (diff) | |
Apparently the --tags option is required to properly describe a brand new tag
| -rwxr-xr-x | tools/make-binaries | 2 | ||||
| -rwxr-xr-x | tools/make-installers | 2 | ||||
| -rwxr-xr-x | tools/make-packages | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/make-binaries b/tools/make-binaries index 3c74d376c..daab03d88 100755 --- a/tools/make-binaries +++ b/tools/make-binaries @@ -63,7 +63,7 @@ then fi rel_name='ejabberd' -rel_vsn=$(git describe | sed -e 's/-g.*//' -e 's/-/./' | tr -d '[:space:]') +rel_vsn=$(git describe --tags | sed -e 's/-g.*//' -e 's/-/./' | tr -d '[:space:]') mix_vsn=$(mix_version "$rel_vsn") crosstool_vsn='1.25.0_rc2' termcap_vsn='1.3.1' diff --git a/tools/make-installers b/tools/make-installers index dcedb6b0c..3a95271a4 100755 --- a/tools/make-installers +++ b/tools/make-installers @@ -63,7 +63,7 @@ else fi rel_name='ejabberd' -rel_vsn=$(git describe | sed -e 's/-g.*//' -e 's/-/./' | tr -d '[:space:]') +rel_vsn=$(git describe --tags | sed -e 's/-g.*//' -e 's/-/./' | tr -d '[:space:]') code_path="/opt/$rel_name-$rel_vsn" data_path="/opt/$rel_name" conf_path="$data_path/conf" diff --git a/tools/make-packages b/tools/make-packages index 366499d97..6a665ef90 100755 --- a/tools/make-packages +++ b/tools/make-packages @@ -60,7 +60,7 @@ then fi rel_name='ejabberd' -rel_vsn=$(git describe | sed -e 's/-g.*//' -e 's/-/./' | tr -d '[:space:]') +rel_vsn=$(git describe --tags | sed -e 's/-g.*//' -e 's/-/./' | tr -d '[:space:]') conf_dir="/opt/$rel_name/conf" pem_file="$conf_dir/server.pem" tmp_dir=$(mktemp -d "/tmp/.$myself.XXXXXX") |