diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-09 00:27:59 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-09 00:27:59 +0100 |
| commit | fadb47884308490085a33d3fb1e857a0f5e5d748 (patch) | |
| tree | b78955b59ae121e50753c0d09e5e298c8ccf05cf /scripts/cpio | |
| parent | 91e7244abc54001dc7b1063cd1b9818d46128bba (diff) | |
| parent | a619c16fa72c3c15a198b452e512a08f18251930 (diff) | |
resolve conflict
Diffstat (limited to 'scripts/cpio')
| -rwxr-xr-x | scripts/cpio | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/scripts/cpio b/scripts/cpio index fc671ca48..1c481221e 100755 --- a/scripts/cpio +++ b/scripts/cpio @@ -2,8 +2,18 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. +os=$(uname) +case $os in + NetBSD|MirBSD) + quiet="" + ;; + *) + quiet="--quiet" + ;; +esac if [ -x /usr/bin/cpio ];then - /usr/bin/cpio --quiet "$@" + /usr/bin/cpio $quiet "$@" else - /bin/cpio --quiet "$@" + /bin/cpio $quiet "$@" fi + |