Index: unix_installer/patch-package/install-lams-patch.sh
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/patch-package/install-lams-patch.sh,v
diff -u -r1.1 -r1.2
--- unix_installer/patch-package/install-lams-patch.sh	27 Aug 2008 04:20:59 -0000	1.1
+++ unix_installer/patch-package/install-lams-patch.sh	5 Sep 2008 04:30:03 -0000	1.2
@@ -216,8 +216,8 @@
 printf "> $sqldir/mysqldump -u$DB_USER -p$DB_PASS $DB_NAME > (backup dir)/dump.sql\n"
 printf "\n--------------------------------------------------------------------------------\n\n"
 
-checkMysql
 checklams
+checkMysql
 backup
 
 printf "\nApplying $LAMS_VERSION_UPDATE patch, this may take a few moments...\n"
@@ -231,14 +231,31 @@
 cp -r assembly/* $EAR_DIR
 printf "\nDone.\n"
 
-printf "\nUpdating database...\n"
+printf "\nApplying language pack...\n"
 
+if [ $USE_ETC_PROPERTIES -ne 1 ]
+	then 
+		ant/bin/ant -logfile language-pack.log -buildfile language-pack/language-pack.xml -Dpropertiesfile=../lams.properties update-languages
+	else
+		ant/bin/ant -logfile language-pack.log -buildfile language-pack/language-pack.xml -Dpropertiesfile=/etc/lams2/lams.properties update-languages
+fi	
+
+if [  "$?" -ne  "0" ]
+then
+	printf "\nLanguage-pack update failed, check language-pack.log."
+	installfailed
+else
+	printf "\nDone.\n"
+fi
+
+printf "\nUpdating database...\n"
 ant/bin/ant -logfile update_db.log -buildfile ant-scripts/update_db.xml update_db
 if [  "$?" -ne  "0" ]
 then
 	printf "\nDatabase update failed, check update_db.log."
 	installfailed
 else
+	printf "\nDone.\n"
 	printf "\n\nPatch update finished!\n"
 	
 	if [ $USE_ETC_PROPERTIES -ne 1 ]
@@ -247,19 +264,3 @@
 		cp lams.properties /etc/lams2
 	fi				
 fi
-
-
-
-
-
-#if [ -r $SQL_DIR/mysql ]
-#then
-#	$SQL_DIR/mysql -v -h$SQL_HOST -u$DB_USER -p$DB_PASS $DB_NAME < sql-scripts/update-script.sql >> patchlog.txt
-#	printf "\nDone.\n"
-#	printf "\n\nPatch complete!\n"
-#else
-#	printf "\nPatch update failed, could not find mysql executable at SQL_DIR: $SQL_DIR"
-#fi
-
-################################################################################
-