blob: 2f66ed60df8f8f0d8d904dfadbcc3d77808c3895 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
--- check_dependencies.sh.orig 2023-01-22 17:00:46.339891749 +0100
+++ check_dependencies.sh 2023-01-22 20:25:11.527264810 +0100
@@ -52,13 +52,13 @@
exit 5
fi
- if $MOC -v 2>&1 |grep Qt\ 3 ; then
+ if $MOC -v 2>&1 |grep "Qt 3" ; then
echo $MOC "is for QT3. Need moc for QT$RADIUM_QT_VERSION. Make sure MOC is set correctly in the Makefile."
echo
exit 5
fi
- if $UIC -v 2>&1 |grep Qt\ 3 ; then
+ if $UIC -v 2>&1 |grep "Qt 3" ; then
echo $UIC "is for QT3. Need uic for QT$RADIUM_QT_VERSION. Make sure UIC is set correctly in the Makefile."
echo
exit 5
@@ -72,7 +72,7 @@
if [[ "$line" == \#* ]] ; then
true
else
- if echo "$line" | grep -e "\ \*" ; then
+ if echo "$line" | grep -e " \*" ; then
echo "This line in api/protos.conf is wrongly formatted. Must use \"<type>*\", not \"<type> *\""
echo
exit 5
@@ -81,31 +81,31 @@
done < "$input"
-if grep int\ seqblockid api/protos.conf ; then
+if grep "int seqblockid" api/protos.conf ; then
echo "The above line(s) in api/protos.conf is/are wrong. seqblock id is 64 bit"
echo
exit 5
fi
-if grep int\ seqblock_id api/protos.conf ; then
+if grep "int seqblock_id" api/protos.conf ; then
echo "The above line(s) in api/protos.conf is/are wrong. seqblock id is 64 bit"
echo
exit 5
fi
-if grep int\ instrument_id api/protos.conf ; then
+if grep "int instrument_id" api/protos.conf ; then
echo "The above line(s) in api/protos.conf is/are wrong. instrument id is 64 bit"
echo
exit 5
fi
-if grep int\ guinum api/protos.conf ; then
+if grep "int guinum" api/protos.conf ; then
echo "The above line(s) in api/protos.conf is/are wrong. guinum is 64 bit"
echo
exit 5
fi
-if grep int\ id api/protos.conf ; then
+if grep "int id" api/protos.conf ; then
echo "The above line(s) in api/protos.conf is/are wrong. id has so far been 64 bit"
echo
exit 5
|