Commit a82302f7 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm repack: don't use fatal()

parent ea97e5fb
...@@ -98,7 +98,7 @@ move_to_opt() ...@@ -98,7 +98,7 @@ move_to_opt()
[ -d "$sdir" ] || continue [ -d "$sdir" ] || continue
rdir="$(echo $sdir | sed -e "s|^$BUILDROOT||")" rdir="$(echo $sdir | sed -e "s|^$BUILDROOT||")"
[ -n "$rdir" ] || return 1 #fatal "Can't resolve $from in $BUILDROOT" [ -n "$rdir" ] || return 1 #fatal "Can't resolve $from in $BUILDROOT"
[ -d "$BUILDROOT$rdir" ] || fatal "Can't resolve $from in $BUILDROOT" [ -d "$BUILDROOT$rdir" ] || return 1 #fatal "Can't resolve $from in $BUILDROOT"
break break
done done
[ -d "$sdir" ] || return 1 #fatal "Can't find any dir from $from list" [ -d "$sdir" ] || return 1 #fatal "Can't find any dir from $from list"
......
...@@ -8,7 +8,7 @@ PRODUCTDIR=/opt/ipera ...@@ -8,7 +8,7 @@ PRODUCTDIR=/opt/ipera
. $(dirname $0)/common.sh . $(dirname $0)/common.sh
LIBDIR=$(echo $BUILDROOT/opt/ipera/client/*/lib) LIBDIR=$(echo $BUILDROOT/opt/ipera/client/*/lib)
[ -d "$LIBDIR" ] || fatal "Can't find $LIBDIR" [ -d "$LIBDIR" ] || exit
epm assure patchelf || exit epm assure patchelf || exit
cd $LIBDIR cd $LIBDIR
......
...@@ -14,7 +14,7 @@ subst "s|^Summary:.*|Summary: VK Teams|" $SPEC ...@@ -14,7 +14,7 @@ subst "s|^Summary:.*|Summary: VK Teams|" $SPEC
# move package to /opt # move package to /opt
mkdir -p $BUILDROOT$PRODUCTDIR mkdir -p $BUILDROOT$PRODUCTDIR
mv $BUILDROOT/* $BUILDROOT$PRODUCTDIR || fatal mv $BUILDROOT/* $BUILDROOT$PRODUCTDIR
subst "s|\"/|\"$PRODUCTDIR/|" $SPEC subst "s|\"/|\"$PRODUCTDIR/|" $SPEC
add_bin_exec_command $PRODUCT add_bin_exec_command $PRODUCT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment