[med-svn] r2719 - trunk/packages/ball/trunk/debian
moeller at alioth.debian.org
moeller at alioth.debian.org
Thu Nov 20 11:13:44 UTC 2008
Author: moeller
Date: 2008-11-20 11:13:44 +0000 (Thu, 20 Nov 2008)
New Revision: 2719
Modified:
trunk/packages/ball/trunk/debian/createBALLDeb
trunk/packages/ball/trunk/debian/debian-ball-install
Log:
Introduced "set -e", simplified the script as a consequence a bit.
Modified: trunk/packages/ball/trunk/debian/createBALLDeb
===================================================================
--- trunk/packages/ball/trunk/debian/createBALLDeb 2008-11-20 10:11:32 UTC (rev 2718)
+++ trunk/packages/ball/trunk/debian/createBALLDeb 2008-11-20 11:13:44 UTC (rev 2719)
@@ -1,25 +1,21 @@
#!/bin/bash -x
# script to create a Debian binary package while creating a source package
-export BALL_PATH=`pwd | sed "s/debian$//g" | sed "s/debian-upstream$//g"`
+# bail out when a command has a non-zero return value
+set -e
+
+export BALL_PATH=`pwd | sed 's/debian$//g' | sed 's/debian-upstream$//g'`
export BALL_INSTALL_PATH=${BALL_PATH}/debian/ball/usr
VERSION="1.2"
-cd $BALL_PATH/debian &&
-mkdir -p libball${VERSION}/usr/lib &&
-mkdir -p libball${VERSION}/usr/share/BALL &&
-mkdir -p libball${VERSION}/usr/share/BALL/doc &&
-mkdir -p libball${VERSION}-dev/usr/include &&
-mkdir -p libball${VERSION}-dev/usr/lib &&
-mkdir -p libball${VERSION}-doc/usr/share/doc/libball-1.2/html &&
-mkdir -p python-ball/usr/share/BALL &&
-mkdir -p python-ball/usr/lib/python2.5/site-packages &&
-mkdir -p ballview/usr/bin &&
-mkdir -p ballview/usr/share/man/man1 &&
-mkdir -p ballview/usr/share/doc/ballview/html
-
cd $BALL_PATH/debian
+mkdir -p libball${VERSION}/usr/lib libball${VERSION}/usr/share/BALL \
+ libball${VERSION}/usr/share/BALL/doc libball${VERSION}-dev/usr/include \
+ libball${VERSION}-dev/usr/lib \
+ libball${VERSION}-doc/usr/share/doc/libball-1.2/html \
+ python-ball/usr/share/BALL python-ball/usr/lib/python2.5/site-packages \
+ ballview/usr/bin ballview/usr/share/man/man1 ballview/usr/share/doc/ballview/html
# remember the targets of the ldconfig symbolic links
LIBBALL_TARGET=$(ls -l ${BALL_INSTALL_PATH}/lib/libBALL.so)
@@ -31,18 +27,22 @@
LIBVIEW_TARGET=$(basename ${LIBVIEW_TARGET})
# get rid of the symbolic links before we copy anything
-rm ${BALL_INSTALL_PATH}/lib/libBALL.so &&
-rm ${BALL_INSTALL_PATH}/lib/libVIEW.so &&
+rm ${BALL_INSTALL_PATH}/lib/libBALL.so
+rm ${BALL_INSTALL_PATH}/lib/libVIEW.so
+
# remove static libs. comment out if you need them
-rm -f ${BALL_INSTALL_PATH}/lib/libBALL.a &&
-rm -f ${BALL_INSTALL_PATH}/lib/libVIEW.a &&
-cp ${BALL_INSTALL_PATH}/lib/libBALL* libball${VERSION}/usr/lib/ &&
-cp ${BALL_INSTALL_PATH}/lib/libVIEW* libball${VERSION}/usr/lib/ &&
-cp -r ${BALL_INSTALL_PATH}/share/BALL/data libball${VERSION}/usr/share/BALL &&
-cp -r ${BALL_INSTALL_PATH}/include/BALL libball${VERSION}-dev/usr/include &&
-ln -s ${BALL_INSTALL_PATH}/lib/${LIBBALL_TARGET} libball${VERSION}-dev/usr/lib/libBALL.so &&
-ln -s ${BALL_INSTALL_PATH}/lib/${LIBVIEW_TARGET} libball${VERSION}-dev/usr/lib/libVIEW.so &&
-cp ${BALL_PATH}/source/APPLICATIONS/BALLVIEW/BALLView ballview/usr/bin/ &&
+rm -f ${BALL_INSTALL_PATH}/lib/libBALL.a
+rm -f ${BALL_INSTALL_PATH}/lib/libVIEW.a
+cp ${BALL_INSTALL_PATH}/lib/libBALL* libball${VERSION}/usr/lib/
+cp ${BALL_INSTALL_PATH}/lib/libVIEW* libball${VERSION}/usr/lib/
+cp -r ${BALL_INSTALL_PATH}/share/BALL/data libball${VERSION}/usr/share/BALL
+cp -r ${BALL_INSTALL_PATH}/include/BALL libball${VERSION}-dev/usr/include
+#
+# FIXME: the links should be relative! Steffen
+#
+ln -s ${BALL_INSTALL_PATH}/lib/${LIBBALL_TARGET} libball${VERSION}-dev/usr/lib/libBALL.so
+ln -s ${BALL_INSTALL_PATH}/lib/${LIBVIEW_TARGET} libball${VERSION}-dev/usr/lib/libVIEW.so
+cp ${BALL_PATH}/source/APPLICATIONS/BALLVIEW/BALLView ballview/usr/bin/
mv libball${VERSION}/usr/lib/libBALL.la libball${VERSION}-dev/usr/lib &&
mv libball${VERSION}/usr/lib/libVIEW.la libball${VERSION}-dev/usr/lib &&
@@ -52,32 +52,30 @@
#mv libball${VERSION}/usr/lib/libVIEW.a libball${VERSION}-dev/usr/lib &&
#cp ../debian-install/ball/bin/BALLView ballview/usr/bin/
-#cp -r ../source/APPLICATIONS/BALLVIEW/BALLView $PNAME/usr/lib/BALL &&
-#cp ../source/APPLICATIONS/BALLVIEW/BALLView $PNAME/usr/bin/ &&
+#cp -r ../source/APPLICATIONS/BALLVIEW/BALLView $PNAME/usr/lib/BALL
+#cp ../source/APPLICATIONS/BALLVIEW/BALLView $PNAME/usr/bin/
# copy the documentation
-cp -r ${BALL_PATH}/doc/BALLView/* ballview/usr/share/doc/ballview/html &&
-cp ${BALL_PATH}/doc/TUTORIAL/tutorial.pdf libball${VERSION}-doc/usr/share/doc/libball-1.2/ &&
-cp -r ${BALL_PATH}/doc/classes libball${VERSION}/usr/share/BALL/doc &&
-cp -r ${BALL_PATH}/doc/internal libball${VERSION}/usr/share/BALL/doc &&
-cp -r ${BALL_PATH}/doc/BALL libball${VERSION}-doc/usr/share/doc/libball-1.2/html &&
+cp -r ${BALL_PATH}/doc/BALLView/* ballview/usr/share/doc/ballview/html
+cp ${BALL_PATH}/doc/TUTORIAL/tutorial.pdf libball${VERSION}-doc/usr/share/doc/libball-1.2/
+cp -r ${BALL_PATH}/doc/classes libball${VERSION}/usr/share/BALL/doc
+cp -r ${BALL_PATH}/doc/internal libball${VERSION}/usr/share/BALL/doc
+cp -r ${BALL_PATH}/doc/BALL libball${VERSION}-doc/usr/share/doc/libball-1.2/html
-cp ${BALL_PATH}/debian/ballview.1 ballview/usr/share/man/man1/ &&
-cp ${BALL_PATH}/debian/ballview.1 ballview/usr/share/man/man1/BALLView.1 &&
-gzip -9 ballview/usr/share/man/man1/ballview.1 &&
-gzip -9 ballview/usr/share/man/man1/BALLView.1 &&
+gzip -9 -c ${BALL_PATH}/debian/ballview.1 > ballview/usr/share/man/man1/ballview.1.gz
+gzip -9 -c ${BALL_PATH}/debian/ballview.1 > ballview/usr/share/man/man1/BALLView.1.gz
-cp -r ${BALL_PATH}/source/EXAMPLES/PYTHON python-ball/usr/share/BALL &&
-cp ${BALL_INSTALL_PATH}/lib/BALLmodule.so python-ball/usr/lib/python2.5/site-packages &&
+cp -r ${BALL_PATH}/source/EXAMPLES/PYTHON python-ball/usr/share/BALL
+cp ${BALL_INSTALL_PATH}/lib/BALLmodule.so python-ball/usr/lib/python2.5/site-packages
-chmod ugo-x libball${VERSION}/usr/share/BALL/data/QSAR/* &&
-chmod ugo-x libball${VERSION}/usr/share/BALL/data/CHARMM/charmm* &&
-chmod ugo-x libball${VERSION}/usr/share/BALL/data/graphics/* &&
-chmod ugo-x libball${VERSION}/usr/share/BALL/data/structures/* &&
-chmod 755 libball${VERSION}/usr/share/BALL/data/structures/DB/ &&
-chmod ugo+x ballview/usr/bin/BALLView &&
-chmod ugo-x python-ball/usr/share/BALL/PYTHON/*.py &&
+chmod ugo-x libball${VERSION}/usr/share/BALL/data/QSAR/*
+chmod ugo-x libball${VERSION}/usr/share/BALL/data/CHARMM/charmm*
+chmod ugo-x libball${VERSION}/usr/share/BALL/data/graphics/*
+chmod ugo-x libball${VERSION}/usr/share/BALL/data/structures/*
+chmod 755 libball${VERSION}/usr/share/BALL/data/structures/DB/
+chmod ugo+x ballview/usr/bin/BALLView
+chmod ugo-x python-ball/usr/share/BALL/PYTHON/*.py
-strip --strip-unneeded libball${VERSION}/usr/lib/*.so &&
-strip --strip-unneeded ballview/usr/bin/* &&
+strip --strip-unneeded libball${VERSION}/usr/lib/*.so
+strip --strip-unneeded ballview/usr/bin/*
strip --strip-unneeded python-ball/usr/lib/python2.5/site-packages/*.so
Modified: trunk/packages/ball/trunk/debian/debian-ball-install
===================================================================
--- trunk/packages/ball/trunk/debian/debian-ball-install 2008-11-20 10:11:32 UTC (rev 2718)
+++ trunk/packages/ball/trunk/debian/debian-ball-install 2008-11-20 11:13:44 UTC (rev 2719)
@@ -1,6 +1,8 @@
#!/bin/bash
# script to build BALL / BALLView to create and compile a Debian/Ubuntu source package
+set -e
+
mymake()
{
make "MAKE=make -j2"
@@ -37,16 +39,9 @@
if [ $1 == "build" ]
then
- cd $BALL_PATH/source
- make doc
- make depend &&
- mymake &&
- make install &&
- cd PYTHON/EXTENSIONS &&
- mymake &&
- make install &&
- cd $BALL_PATH/source/APPLICATIONS/BALLVIEW &&
- mymake
+ cd $BALL_PATH/source && make doc && make depend && mymake && make install
+ cd $BALL_PATH/source/PYTHON/EXTENSIONS && mymake && make install
+ cd $BALL_PATH/source/APPLICATIONS/BALLVIEW && mymake
exit $?
fi
More information about the debian-med-commit
mailing list