make ghc-dep.sh and ghc-pkg-wrapper error if error occurs
This commit is contained in:
parent
90f14946a1
commit
18fd461ac2
@ -1,9 +1,9 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# find rpm provides and requires for Haskell GHC libraries
|
# find rpm provides and requires for Haskell GHC libraries
|
||||||
|
|
||||||
[ $# -lt 2 ] && echo "Usage: $(basename "$0") [--provides|--requires] %{buildroot} %{ghclibdir} [%{?ghc_version}]" && exit 1
|
[ $# -lt 3 ] && echo "Usage: $(basename "$0") [--provides|--requires] %{buildroot} %{ghclibdir} [ghc-version]" && exit 1
|
||||||
|
|
||||||
set +x
|
set +x -e
|
||||||
|
|
||||||
MODE=$1
|
MODE=$1
|
||||||
BUILDROOT=$2
|
BUILDROOT=$2
|
||||||
|
@ -2,10 +2,11 @@
|
|||||||
|
|
||||||
[ $# -lt 1 ] && echo "Usage: `basename $0` %{buildroot}%{ghclibdir} ..." && exit 1
|
[ $# -lt 1 ] && echo "Usage: `basename $0` %{buildroot}%{ghclibdir} ..." && exit 1
|
||||||
|
|
||||||
set +x
|
set +x -e
|
||||||
|
|
||||||
PKGBASEDIR=$1
|
PKGBASEDIR=$1
|
||||||
shift
|
shift
|
||||||
|
|
||||||
if [ -d $PKGBASEDIR/lib ];
|
if [ -d $PKGBASEDIR/lib ];
|
||||||
then PKGCONFDIR=$PKGBASEDIR/lib/package.conf.d
|
then PKGCONFDIR=$PKGBASEDIR/lib/package.conf.d
|
||||||
else PKGCONFDIR=$PKGBASEDIR/package.conf.d
|
else PKGCONFDIR=$PKGBASEDIR/package.conf.d
|
||||||
|
Loading…
Reference in New Issue
Block a user