diff --git a/scripts/mkspec-wrapper.sh b/scripts/mkspec-wrapper.sh index dff10c6d..6ff4ef55 100644 --- a/scripts/mkspec-wrapper.sh +++ b/scripts/mkspec-wrapper.sh @@ -6,59 +6,74 @@ usage() [ "$1" ] && exit $1 } -set -x +append() +{ + local var=$1 + shift + local tmp=`eval echo \\$$var $@ | sed 's/^[[:space:]]*//; s/[[:space:]]*$//'` + eval $var=\"$tmp\" +} # -- here we go -MYNAME=`basename $0` -ID=`whoami` +#set -x if [ ! "$INSTALL_LOG" ]; then #INSTALL_LOG=/var/tmp/%{name}-buildroot/install.log INSTALL_LOG=/tmp/rpmbuild-$ID/install.log fi -MKSPEC_SH="$1" -shift -set -- `getopt -l "provides-run:" -o "P:T:V:S:N:hR:D:X:Y:d:" -- "$@"` +MYNAME=`basename $0` +ID=`whoami` + +eval set -- `getopt -l "provides-run:" -l "provides-devel:" -o "P:T:V:S:N:hR:D:X:Y:d:" -- "$@"` while [ "$1" != -- ]; do +echo checking "$1=$2" >&2 case $1 in -h) usage 0;; -T) - eval TOPDIR="$2" + TOPDIR="$2" shift;; -V) - eval V="$2" + V="$2" shift;; -S) - eval SOURCE="$2" + SOURCE="$2" shift;; -N) - eval NAME="$2" + NAME="$2" shift;; -R) - eval REQUIRES_RUN="$REQUIRES_RUN $2" + append REQUIRES_RUN "$2" shift ;; -X) - eval CONFLICTS_RUN="$CONFLICTS_RUN $2" + append CONFLICTS_RUN "$2" shift ;; -D) - eval REQUIRES_DEVEL="$REQUIRES_DEVEL $2" + append REQUIRES_DEVEL "$2" shift ;; -Y) - eval CONFLICTS_DEVEL="$CONFLICTS_DEVEL $2" + append CONFLICTS_DEVEL "$2" + shift + ;; + --provides-run) + append PROVIDES_RUN "$2" + shift + ;; + --provides-devel) + append PROVIDES_DEVEL "$2" shift ;; -P) - eval PROJECT="$2" + PROJECT="$2" shift;; -d) - eval DISTRIBUTION="$2" + DISTRIBUTION="$2" shift;; *) usage 1;; @@ -67,6 +82,9 @@ shift done shift +MKSPEC_SH="$1" +shift + [ -z "$TOPDIR" ] && TOPDIR=. if [ -z "$V" ]; then