diff --git a/scripts/mkspec-wrapper.sh b/scripts/mkspec-wrapper.sh index 25d33415..dff10c6d 100644 --- a/scripts/mkspec-wrapper.sh +++ b/scripts/mkspec-wrapper.sh @@ -1,5 +1,15 @@ #!/bin/bash +usage() +{ + echo usage: $MYNAME /path/to/mkspec.sh -h [-N name] [-T topdir] [-V version] [-S source] [-R requires] [-P project] >&2 + [ "$1" ] && exit $1 +} + +set -x + +# -- here we go + MYNAME=`basename $0` ID=`whoami` @@ -10,61 +20,45 @@ fi MKSPEC_SH="$1" shift -FILTER_DEVEL='/include/.*.h$\|devel\|make\|lib.*\.a$\|lib.*\.so$\|.*\.exp$\|.*\.def$\|.*\.lib$' - -usage() -{ - echo usage: $MYNAME /path/to/mkspec.sh -h [-N name] [-T topdir] [-V version] [-S source] [-R requires] [-P project] >&2 - [ "$1" ] && exit $1 -} - -set -- `getopt P:T:V:S:N:hR:D:X:Y:d: "$@"` +set -- `getopt -l "provides-run:" -o "P:T:V:S:N:hR:D:X:Y:d:" -- "$@"` while [ "$1" != -- ]; do case $1 in -h) usage 0;; -T) - TOPDIR="$2" + eval TOPDIR="$2" shift;; -V) - V="$2" + eval V="$2" shift;; -S) - SOURCE="$2" + eval SOURCE="$2" shift;; -N) - NAME="$2" + eval NAME="$2" shift;; -R) - while [ "${2:0:1}" != - ]; do - REQUIRES_RUN="$REQUIRES_RUN $2" - shift - done + eval REQUIRES_RUN="$REQUIRES_RUN $2" + shift ;; -X) - while [ "${2:0:1}" != - ]; do - CONFLICTS_RUN="$CONFLICTS_RUN $2" - shift - done + eval CONFLICTS_RUN="$CONFLICTS_RUN $2" + shift ;; -D) - while [ "${2:0:1}" != - ]; do - REQUIRES_DEVEL="$REQUIRES_DEVEL $2" - shift - done + eval REQUIRES_DEVEL="$REQUIRES_DEVEL $2" + shift ;; -Y) - while [ "${2:0:1}" != - ]; do - CONFLICTS_DEVEL="$CONFLICTS_DEVEL $2" - shift - done + eval CONFLICTS_DEVEL="$CONFLICTS_DEVEL $2" + shift ;; -P) - PROJECT="$2" + eval PROJECT="$2" shift;; -d) - DISTRIBUTION="$2" + eval DISTRIBUTION="$2" shift;; *) usage 1;; @@ -115,7 +109,6 @@ export \ SOURCE \ VERSION RELEASE V \ INSTALL_LOG \ - FILTER_DEVEL \ DISTRIBUTION bash $MKSPEC_SH