File storage-fixup-0.2-20080731.diff of Package storage-fixup

Overview Repositories Revisions Requests Users Attributes Meta

File storage-fixup-0.2-20080731.diff of Package storage-fixup (Revision 1a9d644d95030c6e34a5151886fdde37)

Currently displaying revision 1a9d644d95030c6e34a5151886fdde37 , Show latest

Index: b/storage-fixup
===================================================================
--- a/storage-fixup
+++ b/storage-fixup
@@ -84,10 +84,18 @@ debug() {
     if [ $verbose -ne 0 ]; then
 	warn "$@"
     fi
 }
 
+trim() {
+    local str="$1"
+
+    str="${str##*([[:blank:]])}"
+    str="${str%%*([[:blank:]])}"
+    echo -n "$str"
+}
+
 #
 # search_match_cache - search match cache
 # @type: type of match
 # @key: key of property to search
 # @idx: index of device to search for
@@ -96,11 +104,11 @@ debug() {
 # properties are cached but matching entry is not found, 2 if
 # @type:@key properties are not cached yet.  On success, the matched
 # property is returned in $reply.
 #
 search_match_cache() {
-    local type="$1" key="$2" idx="$3"
+    local type="$1" key=$(trim "$2") idx="$3"
     local i key_found=0 cache len match
 
     reply=
 
     for ((i=0;i<${#match_cache[@]};i++)); do
@@ -134,11 +142,11 @@ search_match_cache() {
 # @property: property of the entry to be added
 #
 # Add $property for $type:$key:$idx.
 #
 add_to_match_cache() {
-    local type="$1" key="$2" idx="$3" property="$4"
+    local type="$1" key=$(trim "$2") idx="$3" property=$(trim "$4")
 
     match_cache+=("$type:$key:$idx $property")
     debug "C $type:$key:$idx $property"
     reply="$property"
     return 0
@@ -279,31 +287,31 @@ if [ $max_devs -ne 0 -a ${#storage_devs[
     exit 1
 fi
 
 # populate storage info
 for ((i=0;i<${#storage_devs};i++)); do
-    output="$($hdparm -i ${storage_devs[i]} 2> /dev/null)"
+    output=$($hdparm -i ${storage_devs[i]} 2> /dev/null)
     if [ $? -eq 0 ]; then
 	MODEL=
 	REV=
 	SERIAL=
-	eval "$(echo "$output" | $sed -nr 's/^\s*Model=\s*(.*\S|\s*)\s*,\s*FwRev=\s*(.*\S|\s*)\s*,\s*SerialNo=\s*(.*\S|\s*)\s*$/MODEL=\"\1\"\nREV=\"\2\"\nSERIAL=\"\3\"/p')"
+	eval $(echo "$output" | $sed -nr 's/^\s*Model=\s*(.*\S|\s*)\s*,\s*FwRev=\s*(.*\S|\s*)\s*,\s*SerialNo=\s*(.*\S|\s*)\s*$/MODEL=\"\1\"\nREV=\"\2\"\nSERIAL=\"\3\"/p')
 	add_to_match_cache ata model $i "$MODEL"
 	add_to_match_cache ata rev $i "$REV"
 	add_to_match_cache ata serial $i "$SERIAL"
     fi
 
-    output="$($sg_inq ${storage_devs[i]} 2> /dev/null)"
+    output=$($sg_inq ${storage_devs[i]} 2> /dev/null)
     if [ $? -eq 0 ]; then
 	VENDOR=
 	MODEL=
 	REV=
 	SERIAL=
-	eval "$(echo "$output" | $sed -nr 's/^\s*Vendor identification:\s*(.*\S|\s*)\s*$/VENDOR=\"\1\"/p')"
-	eval "$(echo "$output" | $sed -nr 's/^\s*Product identification:\s*(.*\S|\s*)\s*$/MODEL=\"\1\"/p')"
-	eval "$(echo "$output" | $sed -nr 's/^\s*Product revision level:\s*(.*\S|\s*)\s*$/REV=\"\1\"/p')"
-	eval "$(echo "$output" | $sed -nr 's/^\s*Unit serial number:\s*(.*\S|\s*)\s*$/SERIAL=\"\1\"/p')"
+	eval $(echo "$output" | $sed -nr 's/^\s*Vendor identification:\s*(.*\S|\s*)\s*$/VENDOR=\"\1\"/p')
+	eval $(echo "$output" | $sed -nr 's/^\s*Product identification:\s*(.*\S|\s*)\s*$/MODEL=\"\1\"/p')
+	eval $(echo "$output" | $sed -nr 's/^\s*Product revision level:\s*(.*\S|\s*)\s*$/REV=\"\1\"/p')
+	eval $(echo "$output" | $sed -nr 's/^\s*Unit serial number:\s*(.*\S|\s*)\s*$/SERIAL=\"\1\"/p')
 	add_to_match_cache scsi vendor $i "$VENDOR"
 	add_to_match_cache scsi model $i "$MODEL"
 	add_to_match_cache scsi rev $i "$REV"
 	add_to_match_cache scsi serial $i "$SERIAL"
     fi

Places

File storage-fixup-0.2-20080731.diff of Package storage-fixup (Revision 1a9d644d95030c6e34a5151886fdde37)

Places