From abfdf68d31601ca74f31790a38e6281709ea46a2 Mon Sep 17 00:00:00 2001 From: creme Date: Sun, 24 Nov 2024 15:30:01 +0100 Subject: [PATCH] a better solution for 'freifunk-version' --- .../base/ddmesh/usr/local/bin/freifunk-version | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/salt/freifunk/base/ddmesh/usr/local/bin/freifunk-version b/salt/freifunk/base/ddmesh/usr/local/bin/freifunk-version index d8d3a9ca..8ea6b763 100755 --- a/salt/freifunk/base/ddmesh/usr/local/bin/freifunk-version +++ b/salt/freifunk/base/ddmesh/usr/local/bin/freifunk-version @@ -2,9 +2,13 @@ install_dir="$(uci -qX get ffdd.sys.install_dir)" version="$(head -n3 "$install_dir"/init_server.sh | grep -oP '(?<=^#version=).+' | tr -d '"')" -rev="$(cd "$install_dir" && git describe --all --abbrev=0 | cut -f2 -d"/")" -commit="$(cd "$install_dir" && git show --oneline -s | awk '{print $1}')" +rev="$(git --git-dir=/srv/ffdd-server/.git describe --all --abbrev=0 | cut -f2 -d"/")" +commit="$(git --git-dir=/srv/ffdd-server/.git show --oneline -s | awk '{print $1}')" -printf '%s - %s (%s)\n' "$version" "$rev" "$commit" +if [ "$install_dir" != '' ]; then + printf '%s - %s (%s)\n' "$version" "$rev" "$commit" +else + printf 'n.a.\n' +fi exit 0