diff options
author | Debian Live user <user@debian-BULLSEYE-live-builder-AMD64> | 2023-04-29 07:08:41 -0400 |
---|---|---|
committer | Debian Live user <user@debian-BULLSEYE-live-builder-AMD64> | 2023-04-29 07:08:41 -0400 |
commit | 8398a3f0b397ed40bb405feadd592a871832767e (patch) | |
tree | dce6e43e19afc9379cd48887bf5f8cb0844e3c25 /src | |
parent | 663764ea8b9e547d1e422a7e7a335415405945ab (diff) |
cleanup use of variables
Diffstat (limited to 'src')
-rwxr-xr-x | src/edit-firefox@ | 18 |
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 | |||
15 | 15 | ||
16 | die() { printf "%s: Error: %s\n" "$0" "$*" >&2; exit 1; } | 16 | die() { printf "%s: Error: %s\n" "$0" "$*" >&2; exit 1; } |
17 | 17 | ||
18 | # uses $DIR | ||
19 | measure_write_speed() | 18 | measure_write_speed() |
20 | { | 19 | { |
21 | if [ "$FORCE" -o ! -e "$1" ] | 20 | MEASURE_PATH=$1/urandom.out |
21 | CACHED_RESULT=$2 | ||
22 | |||
23 | if [ "$FORCE" -o ! -e "$CACHED_RESULT" ] | ||
22 | then | 24 | then |
23 | mkdir -p "$(dirname "$1")" | 25 | mkdir -p "$(dirname "$CACHED_RESULT")" |
24 | sync | 26 | sync |
25 | begin=$(date +%s%N) | 27 | begin=$(date +%s%N) |
26 | count=500 | 28 | count=500 |
27 | dd if=/dev/urandom of="$DIR"/urandom.out bs=1M count=$count conv=fdatasync | 29 | dd if=/dev/urandom of="$MEASURE_PATH" bs=1M count=$count conv=fdatasync |
28 | end=$(date +%s%N) | 30 | end=$(date +%s%N) |
29 | nanosecs=$(( end - begin )) | 31 | nanosecs=$(( end - begin )) |
30 | millisecs=$(( nanosecs / 1000 / 1000 )) | 32 | millisecs=$(( nanosecs / 1000 / 1000 )) |
31 | bytes=$(( count * 1000 * 1000 )) | 33 | bytes=$(( count * 1000 * 1000 )) |
32 | bytes_per_second=$(( 1000 * bytes / millisecs )) | 34 | bytes_per_second=$(( 1000 * bytes / millisecs )) |
33 | rm "$DIR"/urandom.out | 35 | rm "$MEASURE_PATH" |
34 | printf "Sanity check: megabytes/second = %s\n" \ | 36 | printf "Sanity check: megabytes/second = %s\n" \ |
35 | "$(( bytes_per_second / 1000 / 1000 ))" >&2 | 37 | "$(( bytes_per_second / 1000 / 1000 ))" >&2 |
36 | printf '%s\n' "$bytes_per_second" > "$1" | 38 | printf '%s\n' "$bytes_per_second" > "$CACHED_RESULT" |
37 | fi | 39 | fi |
38 | cat "$1" | 40 | cat "$CACHED_RESULT" |
39 | } | 41 | } |
40 | 42 | ||
41 | DIR=~/.mozilla | 43 | DIR=~/.mozilla |
@@ -46,7 +48,7 @@ then | |||
46 | . "$CONFDIR"/conf | 48 | . "$CONFDIR"/conf |
47 | fi | 49 | fi |
48 | 50 | ||
49 | disk_write_speed=$(measure_write_speed "$CONFDIR"/diskspeed.dat) | 51 | disk_write_speed=$(measure_write_speed "$DIR" "$CONFDIR"/diskspeed.dat) |
50 | 52 | ||
51 | WRITE_OPS=$(( disk_write_speed / 2 )) | 53 | WRITE_OPS=$(( disk_write_speed / 2 )) |
52 | READ_OPS=$WRITE_OPS | 54 | READ_OPS=$WRITE_OPS |