From f8a9724fdbbf8b561bd2a2a047d9e943505cb4d2 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Mon, 20 Aug 2007 12:06:35 +0000
Subject: [PATCH] factor out some duplication -- mostly I/O redirection

---
 scripts/lvm_dump.sh | 61 +++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 33 deletions(-)

diff --git a/scripts/lvm_dump.sh b/scripts/lvm_dump.sh
index 0ab9ffdcb..9ded51f99 100755
--- a/scripts/lvm_dump.sh
+++ b/scripts/lvm_dump.sh
@@ -116,45 +116,40 @@ fi
 
 if (( $clustered )); then
 	myecho "Gathering cluster info..."
-	echo "NODES: " > $dir/cluster_info
-	echo "----------------------------------" >> $dir/cluster_info
-	log "cman_tool nodes >> $dir/cluster_info 2>> $log"
-	echo " " >> $dir/cluster_info
-
-	echo "STATUS: " > $dir/cluster_info
-	echo "----------------------------------" >> $dir/cluster_info
-	log "cman_tool status >> $dir/cluster_info 2>> $log"
-	echo " " >> $dir/cluster_info
-
-	echo "SERVICES: " >> $dir/cluster_info
-	echo "----------------------------------" >> $dir/cluster_info
-	log "cman_tool services >> $dir/cluster_info 2>> $log"
-	echo " " >> $dir/cluster_info
-
-	echo "LOCKS: "  >> $dir/cluster_info
-	echo "----------------------------------" >> $dir/cluster_info
+
+	{
+	for i in nodes status services; do
+		cap_i=$(echo $i|tr a-z A-Z)
+		printf "$cap_i:\n----------------------------------\n"
+		log "cman_tool $i 2>> $log"
+		echo
+	done
+
+	echo "LOCKS:"
+	echo "----------------------------------"
 	if [ -f /proc/cluster/dlm_locks ]
 	then
-		echo "clvmd" > /proc/cluster/dlm_locks
-		cat /proc/cluster/dlm_locks >> $dir/cluster_info
-		echo " " >> $dir/cluster_info
-		echo "RESOURCE DIR: "  >> $dir/cluster_info
-		cat /proc/cluster/dlm_dir >> $dir/cluster_info
-		echo " " >> $dir/cluster_info
-		echo "DEBUG LOG: "  >> $dir/cluster_info
-		cat /proc/cluster/dlm_debug >> $dir/cluster_info
-		echo " " >> $dir/cluster_info
+		echo clvmd > /proc/cluster/dlm_locks
+		cat /proc/cluster/dlm_locks
+		echo
+		echo "RESOURCE DIR:"
+		cat /proc/cluster/dlm_dir
+		echo
+		echo "DEBUG LOG:"
+		cat /proc/cluster/dlm_debug
+		echo
 	fi
 	if [ -f /debug/dlm/clvmd ]
 	then
-		cat /debug/dlm/clvmd >> $dir/cluster_info
-		echo " " >> $dir/cluster_info
-		echo "WAITERS: "  >> $dir/cluster_info
-		cat /debug/dlm/clvmd_waiters >> $dir/cluster_info
-		echo " " >> $dir/cluster_info
-		echo "MASTER: "  >> $dir/cluster_info
-		cat /debug/dlm/clvmd_master >> $dir/cluster_info
+		cat /debug/dlm/clvmd
+		echo
+		echo "WAITERS:"
+		cat /debug/dlm/clvmd_waiters
+		echo
+		echo "MASTER:"
+		cat /debug/dlm/clvmd_master
 	fi
+	} > $dir/cluster_info
 fi
 
 myecho "Gathering LVM & device-mapper version info..."
-- 
2.43.5