Reformat check_gx_program
License: MIT Signed-off-by: Jakub Sztandera <kubuxu@gmail.com>
Jakub Sztandera committed
Feb 14, 2016 at 23:00 UTC
72f5e3ba73746f2cc9bd68411cedc04ac40e8b1a
1 file changed
+17
-18
bin/check_gx_program
+17
-18
@@ -38,9 +38,9 @@ major_number() {
38
39
# Hack around 'expr' exiting with code 1 when it outputs 0
40
case "$vers" in
41
- 0) echo "0" ;;
42
- 0.*) echo "0" ;;
43
- *) expr "$vers" : "\([^.]*\).*" || return 1
41
+ 0) echo "0" ;;
42
+ 0.*) echo "0" ;;
43
+ *) expr "$vers" : "\([^.]*\).*" || return 1
44
esac
45
}
46
@@ -52,35 +52,34 @@ check_at_least_version() {
52
# Get major, minor and fix numbers for each version
53
MIN_MAJ=$(major_number "$MIN_VERS") || die "No major version number in '$MIN_VERS' for '$PROG_NAME'"
54
CUR_MAJ=$(major_number "$CUR_VERS") || die "No major version number in '$CUR_VERS' for '$PROG_NAME'"
55
- if MIN_MIN=$(expr "$MIN_VERS" : "[^.]*\.\([^.]*\).*")
56
- then
57
- MIN_FIX=$(expr "$MIN_VERS" : "[^.]*\.[^.]*\.\([^.]*\).*") || MIN_FIX="0"
55
+
56
+ if MIN_MIN=$(expr "$MIN_VERS" : "[^.]*\.\([^.]*\).*"); then
57
+ MIN_FIX=$(expr "$MIN_VERS" : "[^.]*\.[^.]*\.\([^.]*\).*") || MIN_FIX="0"
58
else
59
- MIN_MIN="0"
60
- MIN_FIX="0"
59
+ MIN_MIN="0"
60
+ MIN_FIX="0"
61
fi
62
- if CUR_MIN=$(expr "$CUR_VERS" : "[^.]*\.\([^.]*\).*")
63
- then
64
- CUR_FIX=$(expr "$CUR_VERS" : "[^.]*\.[^.]*\.\([^.]*\).*") || CUR_FIX="0"
62
+ if CUR_MIN=$(expr "$CUR_VERS" : "[^.]*\.\([^.]*\).*"); then
63
+ CUR_FIX=$(expr "$CUR_VERS" : "[^.]*\.[^.]*\.\([^.]*\).*") || CUR_FIX="0"
64
else
66
- CUR_MIN="0"
67
- CUR_FIX="0"
65
+ CUR_MIN="0"
66
+ CUR_FIX="0"
67
fi
68
69
# Compare versions
70
VERS_LEAST="$PROG_NAME version '$CUR_VERS' should be at least '$MIN_VERS'"
71
test "$CUR_MAJ" -gt $(expr "$MIN_MAJ" - 1) || die_upgrade "$VERS_LEAST"
72
test "$CUR_MAJ" -gt "$MIN_MAJ" || {
74
- test "$CUR_MIN" -gt $(expr "$MIN_MIN" - 1) || die_upgrade "$VERS_LEAST"
75
- test "$CUR_MIN" -gt "$MIN_MIN" || {
76
- test "$CUR_FIX" -ge "$MIN_FIX" || die_upgrade "$VERS_LEAST"
77
- }
73
+ test "$CUR_MIN" -gt $(expr "$MIN_MIN" - 1) || die_upgrade "$VERS_LEAST"
74
+ test "$CUR_MIN" -gt "$MIN_MIN" || {
75
+ test "$CUR_FIX" -ge "$MIN_FIX" || die_upgrade "$VERS_LEAST"
76
+ }
77
}
78
}
79
80
# Check that the gx program exists
81
83
-type "$GX_PROGRAM_NAME" >/dev/null || die_upgrade "Program $GX_PROGRAM_NAME is not installed!"
82
+type "$GX_PROGRAM_NAME" >/dev/null 2>&1 || die_upgrade "Program $GX_PROGRAM_NAME is not installed!"
83
84
# Check the gx program version
85