Revision: 9389 https://osdn.net/projects/ttssh2/scm/svn/commits/9389 Author: zmatsuo Date: 2021-08-29 23:44:47 +0900 (Sun, 29 Aug 2021) Log Message: ----------- アンインストール時 lang_utf16le/Default.lng が削除されない Modified Paths: -------------- trunk/installer/teraterm.iss trunk/installer/teraterm_cmake.iss.in -------------- next part -------------- Modified: trunk/installer/teraterm.iss =================================================================== --- trunk/installer/teraterm.iss 2021-08-29 14:44:38 UTC (rev 9388) +++ trunk/installer/teraterm.iss 2021-08-29 14:44:47 UTC (rev 9389) @@ -65,6 +65,7 @@ Name: {app}\theme\tile; Components: TeraTerm Name: {app}\plugin; Components: TeraTerm Name: {app}\lang; Components: TeraTerm +Name: {app}\lang_utf16le; Components: TeraTerm [Files] Source: ..\teraterm\release\ttermpro.exe; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion @@ -882,7 +883,7 @@ procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep); var - ini : array[0..5] of String; + ini : array[0..6] of String; buf : String; conf : String; confmsg : String; @@ -896,9 +897,10 @@ ini[0] := '\TERATERM.INI'; ini[1] := '\KEYBOARD.CNF'; ini[2] := '\lang\Default.lng'; - ini[3] := '\ssh_known_hosts'; - ini[4] := '\cygterm.cfg'; - ini[5] := '\broadcast.log'; + ini[3] := '\lang_utf16le\Default.lng'; + ini[4] := '\ssh_known_hosts'; + ini[5] := '\cygterm.cfg'; + ini[6] := '\broadcast.log'; conf := CustomMessage('msg_del_confirm'); app := ExpandConstant('{app}'); @@ -913,7 +915,7 @@ if not silent then begin // delete config files - for i := 0 to 5 do + for i := 0 to 6 do begin buf := app + ini[i]; if FileExists(buf) then begin @@ -940,6 +942,7 @@ // directory is deleted only if empty RemoveDir(app + '\lang'); + RemoveDir(app + '\lang_utf16le'); RemoveDir(app); end; end; Modified: trunk/installer/teraterm_cmake.iss.in =================================================================== --- trunk/installer/teraterm_cmake.iss.in 2021-08-29 14:44:38 UTC (rev 9388) +++ trunk/installer/teraterm_cmake.iss.in 2021-08-29 14:44:47 UTC (rev 9389) @@ -60,6 +60,7 @@ Name: {app}\theme\tile; Components: TeraTerm Name: {app}\plugin; Components: TeraTerm Name: {app}\lang; Components: TeraTerm +Name: {app}\lang_utf16le; Components: TeraTerm [Files] Source: @CMAKE_INSTALL_PREFIX@/ttermpro.exe; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion @@ -877,7 +878,7 @@ procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep); var - ini : array[0..5] of String; + ini : array[0..6] of String; buf : String; conf : String; confmsg : String; @@ -891,9 +892,10 @@ ini[0] := '\TERATERM.INI'; ini[1] := '\KEYBOARD.CNF'; ini[2] := '\lang\Default.lng'; - ini[3] := '\ssh_known_hosts'; - ini[4] := '\cygterm.cfg'; - ini[5] := '\broadcast.log'; + ini[3] := '\lang_utf16le\Default.lng'; + ini[4] := '\ssh_known_hosts'; + ini[5] := '\cygterm.cfg'; + ini[6] := '\broadcast.log'; conf := CustomMessage('msg_del_confirm'); app := ExpandConstant('{app}'); @@ -908,7 +910,7 @@ if not silent then begin // delete config files - for i := 0 to 5 do + for i := 0 to 6 do begin buf := app + ini[i]; if FileExists(buf) then begin @@ -935,6 +937,7 @@ // directory is deleted only if empty RemoveDir(app + '\lang'); + RemoveDir(app + '\lang_utf16le'); RemoveDir(app); end; end;