show also current 'commit' with the freifunk version

Freifunk-Dresden · Nov 11, 2024 · aa9900b · aa9900b
1 parent c5cf31a
commit aa9900b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/salt/freifunk/base/ddmesh/usr/local/bin/freifunk-version b/salt/freifunk/base/ddmesh/usr/local/bin/freifunk-version
@@ -2,7 +2,8 @@
 
 version="$(head -n3 /srv/ffdd-server/init_server.sh | grep -oP '(?<=^#version=).+' | tr -d '"')"
 rev="$(cd /srv/ffdd-server && git describe --all --abbrev=0 | cut -f2 -d"/")"
+commit="$(cd /srv/ffdd-server && git show --oneline -s | awk '{print $1}')"
 
-printf '%s - %s\n' "$version" "$rev"
+printf '%s - %s (%s)\n' "$version" "$rev" "$commit"
 
 exit 0
diff --git a/salt/freifunk/base/ssh/init.sls b/salt/freifunk/base/ssh/init.sls
@@ -38,7 +38,7 @@ ssh_check:
         -----------------------------------------------------------------
          Freifunk {{ servername }}
 
-         ( Version: {{ freifunk_version }} )
+         Version: {{ freifunk_version }}
         -----------------------------------------------------------------
     - user: root
     - group: root