cleanup use of variables

1 files changed, 10 insertions, 8 deletions

diff --git a/src/edit-firefox@ b/src/edit-firefox@
index e190ffc..4bd7e35 100755
--- a/src/edit-firefox@
+++ b/src/edit-firefox@
@@ -15,27 +15,29 @@ fi
 
 die() { printf "%s: Error: %s\n" "$0" "$*" >&2; exit 1; }
 
-# uses $DIR
 measure_write_speed()
 {
-    if [ "$FORCE" -o ! -e "$1" ]
+    MEASURE_PATH=$1/urandom.out
+    CACHED_RESULT=$2
+
+    if [ "$FORCE" -o ! -e "$CACHED_RESULT" ]
     then
-        mkdir -p "$(dirname "$1")"
+        mkdir -p "$(dirname "$CACHED_RESULT")"
         sync
         begin=$(date +%s%N)
         count=500
-        dd if=/dev/urandom of="$DIR"/urandom.out bs=1M count=$count conv=fdatasync
+        dd if=/dev/urandom of="$MEASURE_PATH" bs=1M count=$count conv=fdatasync
         end=$(date +%s%N)
         nanosecs=$(( end - begin ))
         millisecs=$(( nanosecs / 1000 / 1000 ))
         bytes=$(( count * 1000 * 1000 ))
         bytes_per_second=$(( 1000 * bytes / millisecs ))
-        rm "$DIR"/urandom.out
+        rm "$MEASURE_PATH"
         printf "Sanity check: megabytes/second = %s\n" \
                "$(( bytes_per_second / 1000 / 1000 ))" >&2
-        printf '%s\n' "$bytes_per_second" > "$1"
+        printf '%s\n' "$bytes_per_second" > "$CACHED_RESULT"
     fi
-    cat "$1"
+    cat "$CACHED_RESULT"
 }
 
 DIR=~/.mozilla
@@ -46,7 +48,7 @@ then
     . "$CONFDIR"/conf
 fi
 
-disk_write_speed=$(measure_write_speed "$CONFDIR"/diskspeed.dat)
+disk_write_speed=$(measure_write_speed "$DIR" "$CONFDIR"/diskspeed.dat)
 
 WRITE_OPS=$(( disk_write_speed / 2 ))
 READ_OPS=$WRITE_OPS