Permalink
Browse files

debugs

  • Loading branch information...
1 parent 18f41e2 commit c703651d71ef9ee019a2a4420fae40585ac52e4b @xianglei committed Aug 9, 2012
Showing with 22 additions and 26 deletions.
  1. +1 −1 config.inc.php
  2. +20 −11 install.sh
  3. +0 −13 libs/classes/class.etc.php
  4. +1 −1 refresh.php
View
@@ -89,7 +89,7 @@
$env['udf'] = '';#user defined function load command. it should be a jar, if not have an udf , set it to ""
#$env['lang_set'] = 'en_US.UTF-8';
$env['seperator'] = "\t";#\t
-#set columns seperator of your data
+#set default columns seperator for your data
#------------------definations of log path and results path, give these path to 777 mode------------
$env['etl'] = './etl/';# need slash end path to put etl configuration files
View
@@ -1,14 +1,23 @@
#!/bin/sh
-chmod 777 results etl logs
-echo "Set phpHiveAdmin runtime enviroment"
-read -p "Please input Hadoop Home path: " HADOOPHOME
-read -p "Please input Hive Home path: " HIVEHOME
-read -p "Please input Java Home Path: " JAVAHOME
+if [ ! -f "./install.lock" ]; then
+ chmod -R 777 results etl logs
+ echo "Set phpHiveAdmin runtime enviroment\n"
+ echo "If you are using Cloudera Hadoop/Hive edition, just hit enter for next step\n"
+ read -p "Please input Hadoop Home path: " HADOOPHOME
+ read -p "Please input Hive Home path: " HIVEHOME
+ read -p "Please input Java Home Path: " JAVAHOME
-echo $HADOOPHOME
-echo $HIVEHOME
-echo $JAVAHOME
+ echo $HADOOPHOME
+ echo $HIVEHOME
+ echo $JAVAHOME
-sed -i -e "/^\$env\['hadoop_home'\]/{ s@'';@'$HADOOPHOME';@; }" config.inc.php
-sed -i -e "/^\$env\['hive_home'\]/{ s@'';@'$HIVEHOME';@; }" config.inc.php
-sed -i -e "/^\$env\['java_home'\]/{ s@'';@'$JAVAHOME';@; }" config.inc.php
+ sed -i -e "/^\$env\['hadoop_home'\]/{ s@'';@'$HADOOPHOME';@; }" config.inc.php
+ sed -i -e "/^\$env\['hive_home'\]/{ s@'';@'$HIVEHOME';@; }" config.inc.php
+ sed -i -e "/^\$env\['java_home'\]/{ s@'';@'$JAVAHOME';@; }" config.inc.php
+
+ echo "Had been installed, open config.inc.php for more configurations and accesslist.ini for user settings\n"
+
+ echo "Lamia Slaytanic" > install.lock
+else
+ echo "Had been installed, open config.inc.php for more configurations and accesslist.ini for user settings"
+fi
@@ -163,19 +163,6 @@ public function LogAction($pFilename,$pAct,$pStream)
fclose($fp);
}
- public function MakeInstallLock()
- {
- $name_array = array("\x4c","\x69","\x20","\x41","\x6e","\x67");
- $fp = fopen("./install.lock","w");
- foreach($name_array as $v)
- {
- $str .= chr(ord($v));
- }
- $str .= " Xiang Lei\n";
- fputs ($fp,$str);
- fclose($fp);
- }
-
public function NonBlockingRun($pCmd,$pTimestamp,$pFilename,$pType,&$pCode)
{
global $env;
View
@@ -1,6 +1,6 @@
<meta http-equiv="refresh" content="2">
<?php
-$env['output_path'] = '/data/tmp/phpHiveAdmin';
+$env['output_path'] = './results';
include "templates/style.css";
if(!@$_GET['str'])

0 comments on commit c703651

Please sign in to comment.