From 3a0bd384485101a48eba46be8d20da965f38aae6 Mon Sep 17 00:00:00 2001 From: nishi Date: Mon, 24 Jun 2024 12:46:26 +0000 Subject: [PATCH] fix installer git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@422 d4a5a174-5a4a-5b4b-b672-37683c10d7d5 --- Makefiles/installer.mk | 4 +++- RemoteClient/tcpip.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefiles/installer.mk b/Makefiles/installer.mk index 30c1046..1c73044 100644 --- a/Makefiles/installer.mk +++ b/Makefiles/installer.mk @@ -65,6 +65,7 @@ dos-installer: echo "InstallDir \"\$$$(TO)\\DataWorks\"" >> install.nsi echo "XPStyle on" >> install.nsi echo "!define MUI_LICENSEPAGE_RADIOBUTTONS" >> install.nsi + echo "!define MUI_FINISHPAGE_NOAUTOCLOSE" >> install.nsi echo "!insertmacro MUI_RESERVEFILE_LANGDLL" >> install.nsi echo "!insertmacro MUI_PAGE_WELCOME" >> install.nsi echo "!insertmacro MUI_PAGE_LICENSE LICENSE" >> install.nsi @@ -97,12 +98,12 @@ dos-installer: echo " $(CUSTOM_NSIS)" >> install.nsi echo "FunctionEnd" >> install.nsi echo "Section -Pre" >> install.nsi + echo " SetShellVarContext all" >> install.nsi echo " CreateDirectory \"\$$SMPROGRAMS\\\DataWorks\"" >> install.nsi echo "SectionEnd" >> install.nsi echo "SectionGroup /e \"\$$(APP_SET_DESC)\" APP_SET" >> install.nsi echo " Section -PreApp" >> install.nsi echo " CreateDirectory \"\$$INSTDIR\\\bin\"" >> install.nsi - echo " SetShellVarContext all" >> install.nsi echo " SectionEnd" >> install.nsi echo " Section \"\$$(CLIENT_SET_DESC)\" CLIENT_SET" >> install.nsi echo " SetOutPath \"\$$INSTDIR\\\bin\"" >> install.nsi @@ -181,6 +182,7 @@ dos-installer: echo " !insertmacro MUI_DESCRIPTION_TEXT \$${DLL_SET} \"\$$(DLL_SET_DESC)\"" >> install.nsi echo " !insertmacro MUI_DESCRIPTION_TEXT \$${HEADERS_SET} \"\$$(HEADERS_SET_DESC)\"" >> install.nsi echo "!insertmacro MUI_FUNCTION_DESCRIPTION_END" >> install.nsi + cat install.nsi makensis install.nsi cat install.nsi rm install.nsi dataworks.bmp diff --git a/RemoteClient/tcpip.c b/RemoteClient/tcpip.c index 18e1f92..00105ce 100644 --- a/RemoteClient/tcpip.c +++ b/RemoteClient/tcpip.c @@ -92,7 +92,7 @@ int rcli_init(void) { printf("Usage: %s [options] host\n", argv[0]); printf("You can use double-dash or slash for long-format flag, and single-dash or slash for short-foramt flag.\n"); printf("Options:\n"); - printf("\t-p --port [port] Specify the port to be listened on\n"); + printf("\t-p --port [port] Specify the port to be connected to\n"); exit(0); } else { fprintf(stderr, "Invalid option: %s\n", argv[i]); -- 2.43.0