You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by bm...@apache.org on 2012/09/18 06:44:50 UTC
svn commit: r1386981 -
/incubator/bigtop/trunk/bigtop-packages/src/common/datafu/install_datafu.sh
Author: bmahe
Date: Tue Sep 18 04:44:50 2012
New Revision: 1386981
URL: http://svn.apache.org/viewvc?rev=1386981&view=rev
Log:
BIGTOP-702. Make variables used in datafu build/install scripts consistent (Anatoli Fomenko via Bruno Mahé)
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/datafu/install_datafu.sh
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/datafu/install_datafu.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/datafu/install_datafu.sh?rev=1386981&r1=1386980&r2=1386981&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/datafu/install_datafu.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/datafu/install_datafu.sh Tue Sep 18 04:44:50 2012
@@ -25,11 +25,8 @@ usage: $0 <options>
--prefix=PREFIX path to install into
Optional options:
- --doc-dir=DIR path to install docs into [/usr/share/doc/pig]
--lib-dir=DIR path to install pig home [/usr/lib/pig]
- --installed-lib-dir=DIR path where lib-dir will end up on target system
- --bin-dir=DIR path to install bins [/usr/bin]
- --examples-dir=DIR path to install examples [doc-dir/examples]
+ --build-dir=DIR path to pig dist dir
... [ see source for more similar options ]
"
exit 1
@@ -39,11 +36,7 @@ OPTS=$(getopt \
-n $0 \
-o '' \
-l 'prefix:' \
- -l 'doc-dir:' \
-l 'lib-dir:' \
- -l 'installed-lib-dir:' \
- -l 'bin-dir:' \
- -l 'examples-dir:' \
-l 'build-dir:' -- "$@")
if [ $? != 0 ] ; then
@@ -59,21 +52,9 @@ while true ; do
--build-dir)
BUILD_DIR=$2 ; shift 2
;;
- --doc-dir)
- DOC_DIR=$2 ; shift 2
- ;;
--lib-dir)
LIB_DIR=$2 ; shift 2
;;
- --installed-lib-dir)
- INSTALLED_LIB_DIR=$2 ; shift 2
- ;;
- --bin-dir)
- BIN_DIR=$2 ; shift 2
- ;;
- --examples-dir)
- EXAMPLES_DIR=$2 ; shift 2
- ;;
--)
shift ; break
;;
@@ -92,9 +73,8 @@ for var in PREFIX BUILD_DIR ; do
fi
done
-LIB_DIR=${LIB_DIR:-$PREFIX/usr/lib/pig}
-INSTALLED_LIB_DIR=${INSTALLED_LIB_DIR:-/usr/lib/pig}
+LIB_DIR=${LIB_DIR:-/usr/lib/pig}
# First we'll move everything into lib
-install -d -m 0755 $LIB_DIR
-cp $BUILD_DIR/datafu-0.0.4.jar $LIB_DIR
+install -d -m 0755 $PREFIX/$LIB_DIR
+cp $BUILD_DIR/datafu-0.0.4.jar $PREFIX/$LIB_DIR