diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2018-06-08 09:26:25 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2018-06-08 09:26:25 +0000 |
| commit | 52abedae74c4a75fe3906de458244e8d76e72e00 (patch) | |
| tree | 00c1f40a40c91e4863d31d96cc210c90f74877ab /Mk | |
| parent | 258800dd7b7340760c6b0be41ef4537c4b1cc338 (diff) | |
| download | ports-52abedae74c4a75fe3906de458244e8d76e72e00.tar.gz ports-52abedae74c4a75fe3906de458244e8d76e72e00.zip | |
Notes
Diffstat (limited to 'Mk')
| -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 b18743ada66c..2577a964fa09 100644 --- a/Mk/Scripts/check-stagedir.sh +++ b/Mk/Scripts/check-stagedir.sh @@ -62,7 +62,7 @@ parse_mtree() { } >${WRKDIR}/.mtree } -# Sort a directory list by the order of the dfs-sorted file (from find -ds) +# Sort a directory list by the order of the dfs-sorted file (from find -d -s) sort_dfs() { while read dir; do grep "^[0-9]* ${dir}$" ${WRKDIR}/.staged-dirs-dfs-sorted @@ -122,14 +122,14 @@ generate_plist() { | sort -u >${WRKDIR}/.traced-dirs find ${STAGEDIR} -type d | sed -e "s,^${STAGEDIR},,;/^$/d" | sort \ >${WRKDIR}/.staged-dirrms-sorted - find -sd ${STAGEDIR}${PREFIX} -type d -empty | sed -e "s,^${STAGEDIR},,;\,^${PREFIX}$,d;/^$/d" \ + find -s -d ${STAGEDIR}${PREFIX} -type d -empty | sed -e "s,^${STAGEDIR},,;\,^${PREFIX}$,d;/^$/d" \ >${WRKDIR}/.staged-dirs-dfs - find -sd ${STAGEDIR} -type d ! -path "${STAGEDIR}${PREFIX}/*" | sed -e "s,^${STAGEDIR},,;\,^${PREFIX}$,d;/^$/d" \ + find -s -d ${STAGEDIR} -type d ! -path "${STAGEDIR}${PREFIX}/*" | sed -e "s,^${STAGEDIR},,;\,^${PREFIX}$,d;/^$/d" \ >>${WRKDIR}/.staged-dirs-dfs sort ${WRKDIR}/.staged-dirs-dfs >${WRKDIR}/.staged-dirs-sorted awk '{print FNR, $0}' ${WRKDIR}/.staged-dirs-dfs \ >${WRKDIR}/.staged-dirs-dfs-sorted - # Find all staged dirs and then sort them by depth-first (find -ds) + # Find all staged dirs and then sort them by depth-first (find -d -s) comm -13 ${WRKDIR}/.traced-dirs ${WRKDIR}/.staged-dirs-sorted \ | sort_dfs | sed "${sed_dirs_gen}" \ >>${WRKDIR}/.staged-plist || : @@ -199,7 +199,7 @@ check_missing_plist_items() { sed -e "s,^,${WRKDIR}/.missing-dirs," \ -e 's,^\(.*\)$,"\1",' \ ${WRKDIR}/.missing-plist-dirs | xargs mkdir -p - find -ds ${WRKDIR}/.missing-dirs | \ + find -d -s ${WRKDIR}/.missing-dirs | \ sed -e "s,^${WRKDIR}/.missing-dirs,," | \ while read dir; do \ grep -x "${dir}" ${WRKDIR}/.missing-plist-dirs || :; done | \ |