messenger-gtk

commit 7fa74f6e702e09dcd9e5d133d7976e59d9caf044
parent e8d1c2d7f440bea88d4aeffa441a3ac4b0663c3e
Author: Jacki <jacki@thejackimonster.de>
Date:   Fri,  8 Mar 2024 00:46:20 +0100

Fix script to check for git submodules

Signed-off-by: Jacki <jacki@thejackimonster.de>

Diffstat:
D
contrib/check_submodules.sh
 | 
7
-------
M
contrib/get_version.sh
 | 
3
+++
M
meson.build
 | 
1
-

3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/contrib/check_submodules.sh b/contrib/check_submodules.sh
@@ -1,7 +0,0 @@
-#!/bin/sh
-cd "${MESON_SOURCE_ROOT}"
-if test -d "./.git"
-then
-  git submodule init
-  git submodule update
-fi
diff --git a/contrib/get_version.sh b/contrib/get_version.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 # Gets the version number from git, or from the contents of .version
+cd "${MESON_SOURCE_ROOT}"
 VERSION=
 if test -f ".version"
 then
@@ -7,6 +8,8 @@ then
 fi
 if test -d "./.git"
 then
+  git submodule init > /dev/null
+  git submodule update > /dev/null
   VERSION=$(git describe --tags)
   VERSION=${VERSION#v}
   echo $VERSION > .version
diff --git a/meson.build b/meson.build
@@ -25,7 +25,6 @@ project(
     version: run_command('contrib/get_version.sh').stdout().strip(),
 )
 
-meson.add_postconf_script('contrib/check_submodules.sh')
 meson.add_dist_script('contrib/distribute_version.sh', meson.project_version())
 
 use_libportal = true