diff options
| author | Luiz Souza <luiz@netgate.com> | 2017-09-15 11:29:20 -0500 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2017-09-15 11:30:49 -0500 |
| commit | 318a7b7766d442c9c4de0f29bea5f587040ae243 (patch) | |
| tree | 884e004a18751a0a9d50827b2077a0f096840c9f /build | |
| parent | d8455e10d71ab90b7faa96bc1748fa761e7a4166 (diff) | |
| download | pfsense-318a7b7766d442c9c4de0f29bea5f587040ae243.zip pfsense-318a7b7766d442c9c4de0f29bea5f587040ae243.tar.gz | |
Pass the search path to create_core_package.sh.
This allows the use of more than one path to build the package.
Diffstat (limited to 'build')
| -rwxr-xr-x | build/scripts/create_core_pkg.sh | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/build/scripts/create_core_pkg.sh b/build/scripts/create_core_pkg.sh index 9b08d05..377be9f 100755 --- a/build/scripts/create_core_pkg.sh +++ b/build/scripts/create_core_pkg.sh @@ -38,6 +38,7 @@ Options: -f flavor -- package flavor -v version -- package version -r root -- root directory containing package files + -s search -- search path -F filter -- filter pattern to exclude files from plist -d destdir -- Destination directory to create package -h -- Show this help and exit @@ -64,6 +65,9 @@ while getopts t:f:v:r:F:d:h opt; do r) root=$OPTARG ;; + s) + findroot=$OPTARG + ;; F) filter=$OPTARG ;; @@ -125,11 +129,14 @@ else if [ -n "${filter}" ]; then filter="-name ${filter}" fi - (cd ${root} \ - && find . ${filter} -type f -or -type l \ - | sed 's,^.,,' \ - | sort -u \ - ) > ${plist} + : ${findroot="."} + for froot in ${findroot}; do + (cd ${root} \ + && find ${froot} ${filter} -type f -or -type l \ + | sed 's,^.,,' \ + | sort -u \ + ) >> ${plist} + done fi if [ -f "${template_path}/exclude_plist" ]; then |
