Skip to content

Commit

Permalink
version update
Browse files Browse the repository at this point in the history
  • Loading branch information
extracold1209 authored and extracold1209 committed Nov 21, 2018
1 parent adc7cc9 commit d2730b9
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 31 deletions.
58 changes: 29 additions & 29 deletions build/entry-hw.nsi
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
; example1.nsi
;
; This script is perhaps one of the simplest NSIs you can make. All of the
; optional settings are left to their default settings. The installer simply
; optional settings are left to their default settings. The installer simply
; prompts the user asking them where to install, and drops a copy of example1.nsi
; there.
; there.

!include MUI2.nsh

Expand All @@ -14,16 +14,16 @@
!define PRODUCT_NAME "Entry_HW"
!define PROTOCOL_NAME "entryhw"
!define APP_NAME "Entry_HW.exe"
!define PRODUCT_VERSION "1.6.30"
!define PRODUCT_VERSION "1.6.31"
!define PRODUCT_PUBLISHER "EntryLabs"
!define PRODUCT_WEB_SITE "http://www.play-entry.org/"

; MUI Settings / Header
;!define MUI_HEADERIMAGE
;!define MUI_HEADERIMAGE_RIGHT
;!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\orange-r-nsis.bmp"
;!define MUI_HEADERIMAGE_UNBITMAP "${NSISDIR}\Contrib\Graphics\Header\orange-uninstall-r-nsis.bmp"

; MUI Settings / Wizard
;!define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange-nsis.bmp"
;!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange-uninstall-nsis.bmp"
Expand All @@ -39,7 +39,7 @@ OutFile "${PRODUCT_NAME}_${PRODUCT_VERSION}_Setup.exe"
; The default installation directory
InstallDir "C:\${PRODUCT_NAME}"

; Registry key to check for directory (so if you install again, it will
; Registry key to check for directory (so if you install again, it will
; overwrite the old one automatically)
InstallDirRegKey HKLM "Software\${PRODUCT_NAME}" "Install_Dir"

Expand Down Expand Up @@ -95,7 +95,7 @@ LangString SETUP_UNINSTALL_MSG ${LANG_ENGLISH} "Entry_HW is already installed. $
; The stuff to install
Section $(TEXT_ENTRY_TITLE) SectionEntry
SectionIn RO

; Set output path to the installation directory.
;SetOutPath $INSTDIR

Expand All @@ -105,33 +105,33 @@ Section $(TEXT_ENTRY_TITLE) SectionEntry
; Put file there
SetOutPath "$INSTDIR\locales"
File "..\dist\win-ia32-unpacked\locales\*.*"

SetOutPath "$INSTDIR\resources"
File /r "..\dist\win-ia32-unpacked\resources\*.*"

SetOutPath "$INSTDIR"
File "..\dist\win-ia32-unpacked\*.*"
File "icon.ico"

WriteRegStr HKCR "${PROTOCOL_NAME}" "URL Protocol" ""
WriteRegStr HKCR "${PROTOCOL_NAME}\DefaultIcon" "" "$INSTDIR\icon.ico"
WriteRegStr HKCR "${PROTOCOL_NAME}\DefaultIcon" "" "$INSTDIR\icon.ico"
WriteRegStr HKCR "${PROTOCOL_NAME}\Shell\Open" "" "&Open"
WriteRegStr HKCR "${PROTOCOL_NAME}\Shell\Open\Command" "" '"$INSTDIR\${PRODUCT_NAME}.exe" "%1"'

; Write the installation path into the registry
WriteRegStr HKLM "SOFTWARE\${PRODUCT_NAME}" "Install_Dir" "$INSTDIR"

; Write the uninstall keys for Windows
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayName" "$(TEXT_ENTRY)"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayVersion" "${PRODUCT_VERSION}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "Publisher" "${PRODUCT_PUBLISHER}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "UninstallString" '"$INSTDIR\$(TEXT_ENTRY_DELETE).exe"'
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayIcon" '"$INSTDIR\icon.ico"'
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "NoModify" 1
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "NoRepair" 1
WriteUninstaller "\$(TEXT_ENTRY_DELETE).exe"

SectionEnd

; Optional section (can be disabled by the user)
Expand All @@ -141,7 +141,7 @@ Section $(TEXT_START_MENU_TITLE) SectionStartMenu
CreateDirectory "$SMPROGRAMS\EntryLabs\${PRODUCT_NAME}"
CreateShortCut "$SMPROGRAMS\EntryLabs\${PRODUCT_NAME}\$(TEXT_ENTRY_DELETE).lnk" "$INSTDIR\$(TEXT_ENTRY_DELETE).exe" "" "$INSTDIR\$(TEXT_ENTRY_DELETE).exe" 0
CreateShortCut "$SMPROGRAMS\EntryLabs\${PRODUCT_NAME}\$(TEXT_ENTRY).lnk" "$INSTDIR\${PRODUCT_NAME}.exe" "" "$INSTDIR\icon.ico" 0

SectionEnd

;--------------------------------
Expand All @@ -151,7 +151,7 @@ Section $(TEXT_DESKTOP_TITLE) SectionDesktop

SetShellVarContext all
CreateShortCut "$DESKTOP\$(TEXT_ENTRY).lnk" "$INSTDIR\${PRODUCT_NAME}.exe" "" "$INSTDIR\icon.ico" 0

SectionEnd

!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
Expand All @@ -177,7 +177,7 @@ Section "Uninstall"

; Remove shortcuts, if any
Delete "$SMPROGRAMS\EntryLabs\${PRODUCT_NAME}\*.*"

Delete "$DESKTOP\$(TEXT_ENTRY).lnk"

; Remove directories used
Expand All @@ -198,39 +198,39 @@ Function .onInit
mfound:
KillProcDLL::KillProc "${APP_NAME}"
notRunning:

ReadRegStr $R0 HKLM \
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
"UninstallString"
StrCmp $R0 "" done
ReadRegStr $R1 HKLM "SOFTWARE\${PRODUCT_NAME}" "Install_Dir"

ReadRegStr $R1 HKLM "SOFTWARE\${PRODUCT_NAME}" "Install_Dir"
StrCmp $R1 "" done

MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
$(SETUP_UNINSTALL_MSG) \
IDOK uninst
Abort

;Run the uninstaller
uninst:
ClearErrors
;ExecWait '$R0 _?=$INSTDIR'
ExecWait '$R0 _?=$R1'

;IfErrors no_remove_uninstaller done
;no_remove_uninstaller:
IfErrors 0 +2
Goto no_remove_uninstaller
RMDir /r /REBOOTOK $R1
RMDir /r /REBOOTOK $R1
Goto done

no_remove_uninstaller:
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
DeleteRegKey HKLM "SOFTWARE\${PRODUCT_NAME}"
DeleteRegKey HKCR "${PRODUCT_NAME}"
DeleteRegKey HKCR "${PROTOCOL_NAME}"

done:
FunctionEnd

FunctionEnd
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "entry_hw",
"version": "1.6.30",
"description": "엔트리 하드웨어 연결 프로그램1",
"version": "1.6.31",
"description": "엔트리 하드웨어 연결 프로그램",
"author": "EntryLabs",
"main": "app/index.js",
"scripts": {
Expand Down

0 comments on commit d2730b9

Please sign in to comment.