bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject [4/4] git commit: BIGTOP-1090. hue packaging needs to handle mutable bits (app.reg and hue.pth)
Date Tue, 24 Sep 2013 21:30:28 GMT
BIGTOP-1090. hue packaging needs to handle mutable bits (app.reg and hue.pth)


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/8ecc8e3a
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/8ecc8e3a
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/8ecc8e3a

Branch: refs/heads/master
Commit: 8ecc8e3a2ca93c9857490725a6dd7330cb413603
Parents: eb4d2b9
Author: Roman Shaposhnik <rvs@cloudera.com>
Authored: Tue Sep 24 09:55:36 2013 -0700
Committer: Roman Shaposhnik <rvs@cloudera.com>
Committed: Tue Sep 24 09:55:36 2013 -0700

----------------------------------------------------------------------
 bigtop-packages/src/common/hue/install_hue.sh | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/8ecc8e3a/bigtop-packages/src/common/hue/install_hue.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hue/install_hue.sh b/bigtop-packages/src/common/hue/install_hue.sh
index 07ee75c..85e8337 100644
--- a/bigtop-packages/src/common/hue/install_hue.sh
+++ b/bigtop-packages/src/common/hue/install_hue.sh
@@ -132,13 +132,10 @@ find $PREFIX/$LIB_DIR -iname \*.py[co]  -exec rm -f {} \;
 # Making the resulting tree relocatable for the second time
 (cd $PREFIX/$LIB_DIR ; bash tools/relocatable.sh)
 
-# Move desktop.db to a var location
-install -d -m 0755 $PREFIX/$VAR_DIR
-mv $PREFIX/$LIB_DIR/desktop/desktop.db $PREFIX/$VAR_DIR
-
 # Install conf files
 install -d -m 0755 $PREFIX/$CONF_DIR
 cp -r ${BUILD_DIR}/desktop/conf.dist $PREFIX/${CONF_DIR}/conf.empty
+rm -rf $PREFIX/$LIB_DIR/desktop/conf
 ln -fs $CONF_DIR/conf $PREFIX/$LIB_DIR/desktop/conf
 sed -i -e '/\[\[database\]\]/a\
     engine=sqlite3\
@@ -184,3 +181,19 @@ done
 
 # Remove bogus files
 rm -fv `find $PREFIX -iname "build_log.txt"`
+
+# FXIME: for Hue 3.0 the following section would need to go away (hence it is kept at the
bottom)
+
+# Move desktop.db to a var location
+install -d -m 0755 $PREFIX/$VAR_DIR
+mv $PREFIX/$LIB_DIR/desktop/desktop.db $PREFIX/$VAR_DIR
+
+# Move hue.pth to a var location
+mv $PREFIX/$LIB_DIR/build/env/lib/python*/site-packages/hue.pth $PREFIX/$VAR_DIR
+ln -s $VAR_DIR/hue.pth `ls -d $PREFIX/$LIB_DIR/build/env/lib/python*/site-packages/`/hue.pth
+rm $PREFIX/$LIB_DIR/build/env/lib/python*/site-packages/hue.link.pth
+
+# Move app.reg to a var location
+mv $PREFIX/$LIB_DIR/app.reg $PREFIX/$VAR_DIR
+ln -s $VAR_DIR/app.reg $PREFIX/$LIB_DIR/app.reg
+sed -i -e '/HUE_APP_REG_DIR/s#INSTALL_ROOT#"/var/lib/hue/"#' $PREFIX/$LIB_DIR/tools/app_reg/common.py


Mime
View raw message