From 80c136326d57dcbd63e0a4588e726d1740073284 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 14 Feb 2019 13:47:53 +0100
Subject: [SSUS] Refactor dnbd3 update a bit

---
 satellit_upgrader/updater.template.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh
index 771ad3e..89e4d18 100644
--- a/satellit_upgrader/updater.template.sh
+++ b/satellit_upgrader/updater.template.sh
@@ -547,23 +547,24 @@ diffcp "dnbd3/rpc.acl" "/etc/dnbd3-server/rpc.acl"
 diffcp "dnbd3/is-enabled" "$PATH_DNBD3/is-enabled"
 
 if [ -n "$TGZ_DNBD3" ]; then
-	mkdir -p "$TMPDIR/dnbd3.tmp"
-	tar -x -C "$TMPDIR/dnbd3.tmp" -f "$TMPDIR/$TGZ_DNBD3" || perror "Could not extract $TGZ_DNBD3 to $TMPDIR/dnbd3.tmp"
-	cver=$( /opt/openslx/dnbd3/dnbd3-server --version 2> /dev/null )
-	nver=$( cat "$TMPDIR/dnbd3.tmp/version.txt" )
+	tmpdir="$TMPDIR/dnbd3.tmp"
+	mkdir -p "$tmpdir"
+	tar -x -C "$tmpdir" -f "$TMPDIR/$TGZ_DNBD3" || perror "Could not extract $TGZ_DNBD3 to $tmpdir"
+	cver=$( "$PATH_DNBD3/dnbd3-server" --version 2> /dev/null | awk -F': ' '{print $2}' )
+	nver=$( cat "$tmpdir/version.txt" )
 	[ -z "$nver" ] && pwarning "BUG BUG! Updater package contains no dnbd3 version information!"
-	mkdir -p /opt/openslx/dnbd3
+	mkdir -p "$PATH_DNBD3"
 	if [ "$cver" != "$nver" ]; then
 		echo "Compiling new dnbd3-server binary..."
-		cd "$TMPDIR/dnbd3.tmp"
+		cd "$tmpdir"
 		mkdir build
 		cd build
 		if ! failprint cmake -DBUILD_FUSE_CLIENT=OFF -DBUILD_KERNEL_MODULE=OFF -DBUILD_STRESSTEST=OFF -DBUILD_SERVER=ON -DCMAKE_BUILD_TYPE=Release ..; then
 			pwarning "Could not cmake new version $nver of dnbd3-server"
 		elif ! failprint make -j2 dnbd3-server; then
 			pwarning "Could not compile new version $nver of dnbd3-server"
-		elif ! cp -f dnbd3-server /opt/openslx/dnbd3/dnbd3-server; then
-			pwarning "Successfully built new dnbd3-server, but could not copy binary to /opt/openslx/dnbd3/dnbd3-server"
+		elif ! cp -f dnbd3-server "$PATH_DNBD3/dnbd3-server"; then
+			pwarning "Successfully built new dnbd3-server, but could not copy binary to $PATH_DNBD3/dnbd3-server"
 		else # Clear this so we know not to print the "trying to keep going.." message
 			cver=
 		fi
-- 
cgit v1.2.3-55-g7522