Skip to content

Commit

Permalink
fix: discard some files (layout.txt, keyboard.ini, etc.);
Browse files Browse the repository at this point in the history
fix: fail to re-gen yong.ini due to wrong claim position of $xxxkVarHomeDir;
  • Loading branch information
tswwe committed Nov 23, 2024
1 parent cac4a32 commit a480a32
Show file tree
Hide file tree
Showing 8 changed files with 5 additions and 7 deletions.
File renamed without changes.
4 changes: 2 additions & 2 deletions app-win/nsis/xxxk.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
# 声明常量
!define XXXK_NAME_CN "小小星空"
!define XXXK_NAME_EN "xxxk"
!define XXXK_VER "2.0.0.0"
!define XXXK_VER_DATE "20241117"
!define XXXK_VER "2.0.1.0"
!define XXXK_VER_DATE "20241124"
!define XXXK_URL_HOME "https://xkinput.github.io/xxxk-help"
!define XXXK_URL_DOWNLOAD "http://xxxk.ysepan.com"
!define XXXK_REG_ROOT "HKLM"
Expand Down
6 changes: 2 additions & 4 deletions app-win/nsis/xxxkFuncAppFiles.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ Function xxxkFuncAppFiles
File "${XXXK_DIR_DATA_BASE}\bd.txt"
File "${XXXK_DIR_DATA_BASE}\bihua.bin"
File "${XXXK_DIR_DATA_BASE}\crab.txt"
File "${XXXK_DIR_DATA_BASE}\keyboard.ini"
File "${XXXK_DIR_DATA_BASE}\layout.txt"
File "${XXXK_DIR_DATA_BASE}\menu.ini"
WriteINIStr $INSTDIR\menu.ini "about" "exec" "$$MSG(v${XXXK_VER}-Build${XXXK_VER_DATE})"
File "${XXXK_DIR_DATA_BASE}\README.txt"
Expand Down Expand Up @@ -101,8 +99,8 @@ Function un.xxxkFuncAppFiles
Delete "$INSTDIR\bd.txt"
Delete "$INSTDIR\bihua.bin"
Delete "$INSTDIR\crab.txt"
Delete "$INSTDIR\keyboard.ini"
Delete "$INSTDIR\layout.txt"
Delete "$INSTDIR\keyboard.ini" # 历史遗留
Delete "$INSTDIR\layout.txt" # 历史遗留
Delete "$INSTDIR\menu.ini"
Delete "$INSTDIR\README.txt"
Delete "$INSTDIR\urls.txt"
Expand Down
2 changes: 1 addition & 1 deletion app-win/nsis/xxxkFuncYongIni.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
!include "IniGetSectionNames.nsh"
!include "xxxkFuncBase.nsh"
!include "WinVer.nsh"
Var /GLOBAL xxxkVarHomeDir # 变量不会自动提升,因此要放前面

# 把 pinyin 方案添加到目标 yong.ini
# 调用方法:${xxxkAddPinyinToIni} "目标ini"
Expand Down Expand Up @@ -148,7 +149,6 @@ FunctionEnd

Function xxxkFuncYongIni

Var /GLOBAL xxxkVarHomeDir
${xxxkGetHomeDir} $xxxkVarHomeDir "$INSTDIR"
${If} "$xxxkVarHomeDir" == "$INSTDIR\.yong"
${OrIf} ${SectionIsSelected} ${optPortable}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit a480a32

Please sign in to comment.