Index: win_installer/src/language-pack.nsi =================================================================== diff -u -rc5ff44d0bed4d2a4cf72debb1dcb1bcfdfd3f8fa -r059e8ba497f9a1a15a6ab9f63f3221de2b5db5d5 --- win_installer/src/language-pack.nsi (.../language-pack.nsi) (revision c5ff44d0bed4d2a4cf72debb1dcb1bcfdfd3f8fa) +++ win_installer/src/language-pack.nsi (.../language-pack.nsi) (revision 059e8ba497f9a1a15a6ab9f63f3221de2b5db5d5) @@ -23,9 +23,11 @@ # includes #!include "TextFunc.nsh" + !include "Functions.nsh" !include "MUI.nsh" !include "LogicLib.nsh" +!define ArrayNoTemp4 !include "Array.nsh" @@ -152,7 +154,6 @@ # Variables ;-------------------------------- Var MYSQL_DIR -Var MYSQL_ROOT_PASS Var DB_NAME Var DB_USER Var DB_PASS @@ -444,11 +445,18 @@ pop $0 detailprint "SQL script result for Resource and Forum: $\n$0" - IntOp $R0 "$myArray_UBound" + 1 - ${while} $RO != 0 + /*IntOp $R0 "$FS_FOLDERS_UBound" + 1 + ${FS_FOLDERS->Pop} $R1 + MessageBox MB_OK|MB_ICONEXCLAMATION "Forum and Scribe: $R1 $\nElements $R0" + IntOp $R0 "$FS_FOLDERS_UBound" + 1 + */ + + IntOp $R0 "$FS_FOLDERS_UBound" + 1 + ${while} $R0 != 0 ${FS_FOLDERS->Pop} $R1 MessageBox MB_OK|MB_ICONEXCLAMATION "Forum and Scribe: $R1 $\nElements $R0" - IntOp $R0 "$myArray_UBound" + 1 + IntOp $R0 "$FS_FOLDERS_UBound" + 1 + MessageBox MB_OK|MB_ICONEXCLAMATION "Forum and Scribe: $R1 $\nElements $R0" ${endwhile} @@ -463,6 +471,8 @@ detailprint $SQL_QUERY pop $0 pop $1 + strcpy $1 $1 -2 + push $1 ; Getting the muliple entries out ${while} $1 != "" @@ -473,22 +483,21 @@ pop $1 ${if} $FOLDER_FLAG == "0" - ${CS_FOLDERS->Push} $RO + ${CS_FOLDERS->Push} $R0 #MessageBox MB_OK|MB_ICONEXCLAMATION "Chat and scribe: $R0 $\n" ${endif} ${if} $FOLDER_FLAG == "1" - ${FS_FOLDERS->Push} $RO + ${FS_FOLDERS->Push} $R0 #MessageBox MB_OK|MB_ICONEXCLAMATION "Forum and Scribe: $R0" ${endif} ${if} $FOLDER_FLAG == "2" - ${RF_FOLDERS->Push} $RO + ${RF_FOLDERS->Push} $R0 #MessageBox MB_OK|MB_ICONEXCLAMATION "Resource and Forum: $R0" ${endif} ${endwhile} - strcpy $1 $1 -2 - push $1 + #check for errors and write result to install window ${if} $0 != 0 goto Errors @@ -497,7 +506,7 @@ goto Finish Errors: - DetailPrint "Can't read from $MYSQL_DIR\$DB_NAME$ database" + DetailPrint "Can't read from $MYSQL_DIR\$DB_NAME database" Finish: clearerrors