Index: win_installer/src/installer.nsi =================================================================== diff -u -rbc9ea44d2686d1c7e6e8b0934324dfbf1f90cfae -ra3a5886277ace29f0031e83ebfabc001ad5c44ee --- win_installer/src/installer.nsi (.../installer.nsi) (revision bc9ea44d2686d1c7e6e8b0934324dfbf1f90cfae) +++ win_installer/src/installer.nsi (.../installer.nsi) (revision a3a5886277ace29f0031e83ebfabc001ad5c44ee) @@ -847,7 +847,7 @@ Function WriteRegEntries WriteRegStr HKLM "${REG_HEAD}" "dir_jdk" $JDK_DIR - WriteRegStr HKLM "${REG_HEAD}" "dir_mysql" $MYSQL_DIR + WriteRegStr HKLM "${REG_HEAD}" "dir_mysql" "$MYSQL_DIR\" WriteRegStr HKLM "${REG_HEAD}" "dir_inst" $INSTDIR WriteRegStr HKLM "${REG_HEAD}" "dir_repository" $LAMS_REPOSITORY WriteRegStr HKLM "${REG_HEAD}" "version" "${VERSION}" Index: win_installer/src/language-pack.nsi =================================================================== diff -u -r7328cef40926293d7a7bb6c80ac09c1fe6bd1e64 -ra3a5886277ace29f0031e83ebfabc001ad5c44ee --- win_installer/src/language-pack.nsi (.../language-pack.nsi) (revision 7328cef40926293d7a7bb6c80ac09c1fe6bd1e64) +++ win_installer/src/language-pack.nsi (.../language-pack.nsi) (revision a3a5886277ace29f0031e83ebfabc001ad5c44ee) @@ -73,9 +73,9 @@ $\t "(lams install directory)\jboss-4.0.2\server\default\deploy\lams.ear\lams-dictionary.jar\lams-dictionary.zip"$\n$\n\ Language Files will then be overwritten by the new LAMS Language Pack ${VERSION}' -ReserveFile "finish.ini" + !define MUI_FINISHPAGE !define MUI_FINISHPAGE_TITLE "LAMS Language Pack ${VERSION} Installation Successfull" !define MUI_FINISHPAGE_TITLE_3LINES @@ -402,23 +402,23 @@ ; getting the rows for Chat and Scribe strcpy $SQL_QUERY '"SELECT learning_library_id FROM lams_learning_library WHERE title = $\'Chat and Scribe$\';"' - strcpy $SQL_QUERY '"$MYSQL_DIRbin\mysql.exe" -u"$DB_USER" -p"$DB_PASS" -s -i -B $DB_NAME -e $SQL_QUERY' + strcpy $SQL_QUERY '"$MYSQL_DIR\bin\mysql.exe" -u"$DB_USER" -p"$DB_PASS" -s -i -B $DB_NAME -e $SQL_QUERY' strcpy $FOLDER_FLAG "0" call executeSQLScript pop $0 #detailprint "SQL script result for Chat and Scribe: $\n$0" ; getting the rows for Forum and Scribe strcpy $SQL_QUERY '"SELECT learning_library_id FROM lams_learning_library WHERE title = $\'Forum and Scribe$\';"' - strcpy $SQL_QUERY '"$MYSQL_DIRbin\mysql.exe" -u"$DB_USER" -p"$DB_PASS" -s -i -B $DB_NAME -e $SQL_QUERY' + strcpy $SQL_QUERY '"$MYSQL_DIR\bin\mysql.exe" -u"$DB_USER" -p"$DB_PASS" -s -i -B $DB_NAME -e $SQL_QUERY' strcpy $FOLDER_FLAG "1" call executeSQLScript pop $0 #detailprint "SQL script result for Forum and Scribe: $\n$0" ; getting the rows for Resources and Forum strcpy $SQL_QUERY '"SELECT learning_library_id FROM lams_learning_library WHERE title = $\'Resources and Forum$\';"' - strcpy $SQL_QUERY '"$MYSQL_DIRbin\mysql.exe" -u"$DB_USER" -p"$DB_PASS" -s -i -B $DB_NAME -e $SQL_QUERY' + strcpy $SQL_QUERY '"$MYSQL_DIR\bin\mysql.exe" -u"$DB_USER" -p"$DB_PASS" -s -i -B $DB_NAME -e $SQL_QUERY' strcpy $FOLDER_FLAG "2" call executeSQLScript pop $0