diff options
| author | yustin | 2023-04-18 23:08:12 +0200 |
|---|---|---|
| committer | yustin | 2023-04-18 23:08:12 +0200 |
| commit | 529e04b15fb8ef072f8e3180f79bce5313d5140d (patch) | |
| tree | 641be76dc7018a991328507c3be2500e28bfe12b /grep.patch | |
| parent | 4d8eecb16eef064d5e57e7666e2b2d9c5920c0a2 (diff) | |
| download | aur-529e04b15fb8ef072f8e3180f79bce5313d5140d.tar.gz | |
7.1.68-2
Diffstat (limited to 'grep.patch')
| -rw-r--r-- | grep.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/grep.patch b/grep.patch new file mode 100644 index 000000000000..2f66ed60df8f --- /dev/null +++ b/grep.patch @@ -0,0 +1,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 |