diff options
| author | antoine <antoine@FreeBSD.org> | 2014-04-24 04:46:45 +0800 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2014-04-24 04:46:45 +0800 |
| commit | d9d776f2f046be8db7360d37fa01e5a143ef6731 (patch) | |
| tree | caf41ace7b338f08908533bbe3d4a3611784ba31 | |
| parent | 33ebf9e7d6fdb2063004c37f957dc6f9b4cc7cad (diff) | |
| download | freebsd-ports-graphics-d9d776f2f046be8db7360d37fa01e5a143ef6731.tar.gz freebsd-ports-graphics-d9d776f2f046be8db7360d37fa01e5a143ef6731.tar.zst freebsd-ports-graphics-d9d776f2f046be8db7360d37fa01e5a143ef6731.zip | |
- Handle plist containing @unexec /bin/rmdir
- Handle directories ending with digits
With hat: portmgr
| -rw-r--r-- | Mk/Scripts/check-stagedir.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Mk/Scripts/check-stagedir.sh b/Mk/Scripts/check-stagedir.sh index 8ad3a11007f..70d80f430aa 100644 --- a/Mk/Scripts/check-stagedir.sh +++ b/Mk/Scripts/check-stagedir.sh @@ -93,12 +93,12 @@ if [ $makeplist = 0 ] ; then fi case $line in - @dirrm*|'@unexec rmdir'*) + @dirrm*|'@unexec rmdir'*|'@unexec /bin/rmdir'*) line="$(printf %s "$line" \ - | sed -Ee 's/\|\|.*//;s|[0-9]*[[:space:]]*>[&]?[[:space:]]*[^[:space:]]+||g' \ - -e "/^@unexec[[:space:]]+rmdir/s|([^%])%D([^%])|\1${PREFIX}\2|g" \ - -e '/^@unexec[[:space:]]+rmdir/s|"(.*)"[[:space:]]+|\1|g' \ - -e 's/@unexec[[:space:]]+rmdir[[:space:]]+//' \ + | sed -Ee 's/\|\|.*//;s|[[:space:]]+[0-9]*[[:space:]]*>[&]?[[:space:]]*[^[:space:]]+||g' \ + -e "/^@unexec[[:space:]]+(\/bin\/)?rmdir/s|([^%])%D([^%])|\1${PREFIX}\2|g" \ + -e '/^@unexec[[:space:]]+(\/bin\/)?rmdir/s|"(.*)"[[:space:]]*|\1|g' \ + -e 's/@unexec[[:space:]]+(\/bin\/)?rmdir[[:space:]]+//' \ -e 's/@dirrm(try)?[[:space:]]+//' \ -e 's/[[:space:]]+$//')" case "$line" in |