Merge branch 'edge' of github.com:ktgit/knowledgetree into edge

unknown
2 parents 79805226 a2de260d
Showing 8 changed files with 26 additions and 37 deletions
dmsctl.sh
setup/migrate/steps/migrateInstallation.php
setup/upgrade/step.php
setup/upgrade/steps/upgradeDatabase.php
setup/upgrade/upgradeWizard.php
setup/upgrade/upgrader.php
setup/wizard/installUtil.php
setup/wizard/lib/services/windowsLucene.php
@@ -16,13 +16,30 @@ INSTALL_PATH=`pwd`
 JAVABIN=/usr/bin/java
 ZEND_DIR=/usr/local/zend
+# exits if the UID is not 0 [root]
+check_root_privileges()
+{
+    ID="id -u"
+        MYUID=`$ID 2> /dev/null`
+	    if [ ! -z "$MYUID" ]; then
+	           if [ $MYUID != 0 ]; then
+		           echo "You need root privileges to run this script!";
+			   exit 1
+		   fi
+	    else
+		echo "Could not detect UID";
+		exit 1
+	   fi
+}
+
+
 if [ -f /etc/zce.rc ];then
     . /etc/zce.rc
 else
     echo "/etc/zce.rc doesn't exist!"
     exit 1;
 fi
-
+check_root_privileges
 # OpenOffice
 SOFFICEFILE=soffice
@@ -160,7 +160,7 @@ class migrateInstallation extends step
     public function checkVersion() {
 		if($this->foundVersion < $this->supportedVersion) {
 			$this->versionError = true;
-			$this->error[] = "KT installation needs to be 3.6.1 or higher";
+			$this->error[] = "KnowledgeTree installation needs to be 3.6.1 or higher";
 			return false;
 		}
@@ -173,7 +173,7 @@ class migrateInstallation extends step
 			$foundVersion = file_get_contents($verFile);
 			return $foundVersion;
     	} else {
-			$this->error[] = "KT installation version not found";
+			$this->error[] = "KnowledgeTree installation version not found";
     	}
 		return false;
@@ -214,10 +214,10 @@ class migrateInstallation extends step
 						return true;
 					}
-					$this->error[] = "KT installation configuration file empty";
+					$this->error[] = "KnowledgeTree installation configuration file empty";
 				}
 			} else {
-				$this->error[] = "KT installation configuration file not found";
+				$this->error[] = "KnowledgeTree installation configuration file not found";
 			}
 		} else {
 			$this->error[] = "Please Enter a Location";
@@ -467,7 +467,7 @@ class Step
 			$foundVersion = file_get_contents($verFile);
 			return $foundVersion;
     	} else {
-			$this->error[] = "KT installation version not found";
+			$this->error[] = "KnowledgeTree installation version not found";
     	}
 		return false;
@@ -202,7 +202,7 @@ class upgradeDatabase extends Step
 			$foundVersion = file_get_contents($verFile);
 			return $foundVersion;
     	} else {
-			$this->error[] = "KT installation version not found";
+			$this->error[] = "KnowledgeTree installation version not found";
     	}
 		return false;
@@ -146,18 +146,6 @@ class UpgradeWizard {
 	}
 	/**
-	* Create upgrade file
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @param none
-	* @return void
- 	*/
-	private function createUpgradeFile() {
-		touch(SYSTEM_DIR.'var'.DS.'bin'.DS."upgrade.lock");
-	}
-	
-	/**
 	* Remove upgrade file
 	*
 	* @author KnowledgeTree Team
@@ -222,8 +210,6 @@ class UpgradeWizard {
  	*/
 	public function dispatch() {
 		$this->load();
-        // is this necessary?
-    	$this->createUpgradeFile();
 		$response = $this->systemChecks();
 		if($this->util->installationSpecified()) { // Check if the migrator needs to be accessed
 			$this->util->redirect('../wizard/index.php?step_name=install_type');
@@ -400,20 +400,6 @@ class Upgrader {
     	for ($i=1; $i< count($steps)+1; $i++) {
     		$this->_upgradeHelper($steps[$i]);
     	}
-
-    	$this->_completeUpgrade();
-    }
-
-	/**
-	* Complete upgrade cleanup process
-	*
-	* @author KnowledgeTree Team
-	* @param none
-	* @access private
-	* @return void
-	*/
-    private function _completeUpgrade() {
-    	touch("upgrade");
     }
 	/**
@@ -878,7 +878,7 @@ class InstallUtil {
 			return $type;
     	}
-		return false;
+		return "community";
     }
    /**
@@ -424,7 +424,7 @@ class windowsLucene extends windowsService {
 			$luceneExe = $this->getLuceneExe();
 			$luceneSource = $this->getLuceneSource();
 			$luceneDir = $this->getluceneDir();
-			$cmd = "\"{$luceneExe}\""." -install \"".$this->getName()."\" -description "."\"".$this->description."\""." \"".$this->getJavaJVM(). "\" -Djava.class.path=\"".$luceneSource."\"". " -start ".$this->getLuceneServer(). " -out \"".$this->getLuceneOut()."\" -err \"".$this->getLuceneError()."\" -current \"".$luceneDir."\" -auto";
+			$cmd = "\"{$luceneExe}\""." -install \"".$this->getName()."\" \"".$this->getJavaJVM(). "\" -Djava.class.path=\"".$luceneSource."\"". " -start ".$this->getLuceneServer(). " -out \"".$this->getLuceneOut()."\" -err \"".$this->getLuceneError()."\" -current \"".$luceneDir."\" -auto";
         	if(DEBUG) {
         		echo "$cmd<br/>";
         		return false;