Skip to content

Commit 3c5c9a3

Browse files
committed
freifunk-version: get ffdd-server 'install_dir' from uci
1 parent a5e15eb commit 3c5c9a3

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

salt/freifunk/base/ddmesh/usr/local/bin/freifunk-version

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/usr/bin/env bash
22

3-
version="$(head -n3 /srv/ffdd-server/init_server.sh | grep -oP '(?<=^#version=).+' | tr -d '"')"
4-
rev="$(cd /srv/ffdd-server && git describe --all --abbrev=0 | cut -f2 -d"/")"
5-
commit="$(cd /srv/ffdd-server && git show --oneline -s | awk '{print $1}')"
3+
install_dir="$(uci -qX get ffdd.sys.install_dir)"
4+
version="$(head -n3 "$install_dir"/init_server.sh | grep -oP '(?<=^#version=).+' | tr -d '"')"
5+
rev="$(cd "$install_dir" && git describe --all --abbrev=0 | cut -f2 -d"/")"
6+
commit="$(cd "$install_dir" && git show --oneline -s | awk '{print $1}')"
67

78
printf '%s - %s (%s)\n' "$version" "$rev" "$commit"
89

0 commit comments

Comments
 (0)