From 300c0a3a283e3f2aa1d4931a1036673020ed3452 Mon Sep 17 00:00:00 2001 From: Satoshi Asami Date: Fri, 5 Jun 1998 07:51:03 +0000 Subject: [PATCH] Change "@exec [ ! foo ] && bar" to "@exec [ foo ] || bar" so there won't be any spurious warning messages when the command bar isn't run. --- databases/mysql322-server/pkg-plist | 2 +- databases/mysql323-server/pkg-plist | 2 +- databases/mysql40-server/pkg-plist | 2 +- databases/mysql41-server/pkg-plist | 2 +- databases/mysql50-server/pkg-plist | 2 +- databases/mysql51-server/pkg-plist | 2 +- databases/mysql54-server/pkg-plist | 2 +- databases/mysql55-server/pkg-plist | 2 +- databases/mysql60-server/pkg-plist | 2 +- databases/percona55-server/pkg-plist | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/databases/mysql322-server/pkg-plist b/databases/mysql322-server/pkg-plist index d75768928c46..f9e65a7522c2 100644 --- a/databases/mysql322-server/pkg-plist +++ b/databases/mysql322-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a diff --git a/databases/mysql323-server/pkg-plist b/databases/mysql323-server/pkg-plist index d75768928c46..f9e65a7522c2 100644 --- a/databases/mysql323-server/pkg-plist +++ b/databases/mysql323-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a diff --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist index d75768928c46..f9e65a7522c2 100644 --- a/databases/mysql40-server/pkg-plist +++ b/databases/mysql40-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist index d75768928c46..f9e65a7522c2 100644 --- a/databases/mysql41-server/pkg-plist +++ b/databases/mysql41-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist index d75768928c46..f9e65a7522c2 100644 --- a/databases/mysql50-server/pkg-plist +++ b/databases/mysql50-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist index d75768928c46..f9e65a7522c2 100644 --- a/databases/mysql51-server/pkg-plist +++ b/databases/mysql51-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist index d75768928c46..f9e65a7522c2 100644 --- a/databases/mysql54-server/pkg-plist +++ b/databases/mysql54-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist index d75768928c46..f9e65a7522c2 100644 --- a/databases/mysql55-server/pkg-plist +++ b/databases/mysql55-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist index d75768928c46..f9e65a7522c2 100644 --- a/databases/mysql60-server/pkg-plist +++ b/databases/mysql60-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist index d75768928c46..f9e65a7522c2 100644 --- a/databases/percona55-server/pkg-plist +++ b/databases/percona55-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a