replace almost all writes to yohoho log with writes to our debug log

[jarrg-ian.git] / src / winsetup.nsi

diff --git a/src/winsetup.nsi b/src/winsetup.nsi
index 333e0425befda8a574613782500adf6e85477558..9627400e17f4db7bd57a8489a5a31adfc7cbcbf9 100644 (file)
--- a/src/winsetup.nsi
+++ b/src/winsetup.nsi
@@ -1,9 +1,9 @@
 !include FileFunc.nsh
 !insertmacro GetParent
 
-Name "JPCTB"
-OutFile "jpctb-setup.exe"
-InstallDir "$LOCALAPPDATA\JPCTB"
+Name "JARRG"
+OutFile "jarrg-setup.exe"
+InstallDir "$LOCALAPPDATA\JARRG"
 RequestExecutionLevel user
 
 var YPPDIR
@@ -20,23 +20,23 @@ Call FindJRE
 Call CheckYPP
 Call CopyJRE
 Call YPPShortcuts
-WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JPCTB" \
-"DisplayName" "JPCTB - Java Pirate Commodity Trader with Bleach"
-WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JPCTB" \
-"UninstallString" "$\"$INSTDIR\uninstall-jpctb.exe$\""
-WriteUninstaller "$INSTDIR\uninstall-jpctb.exe"
+WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JARRG" \
+"DisplayName" "JARRG - Java Pirate Commodity Trader with Bleach"
+WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JARRG" \
+"UninstallString" "$\"$INSTDIR\uninstall-jarrg.exe$\""
+WriteUninstaller "$INSTDIR\uninstall-jarrg.exe"
 SectionEnd
 
 Section "un."
 RMDir /r $INSTDIR\jre
-Delete $INSTDIR\uninstall-jpctb.exe
+Delete $INSTDIR\uninstall-jarrg.exe
 RMDIR $INSTDIR
 
-Delete "$SMPROGRAMS\JPCTB.lnk"
-Delete "$SMPROGRAMS\JPCTB Control Panel.lnk"
-Delete "$DESKTOP\JPCTB.lnk"
+Delete "$SMPROGRAMS\JARRG.lnk"
+Delete "$SMPROGRAMS\JARRG Control Panel.lnk"
+Delete "$DESKTOP\JARRG.lnk"
 
-DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JPCTB"
+DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JARRG"
 
 SectionEnd
 
@@ -51,7 +51,7 @@ IfFileExists $YPPDIR\java 0 NoYPPJ15
 Abort "YPP currently using internal Java 1.5.  You will need to uninstall Puzzle Pirates and then reinstall it before rerunning this installer."
 NoYPPJ15:
 IfFileExists $YPPDIR\java_vm 0 NOYPPJ16
-Abort "YPP currently using internal Java 1.5.  You will need to uninstall Puzzle Pirates and then reinstall it before rerunning this installer."
+Abort "YPP currently using internal Java 1.6.  You will need to uninstall Puzzle Pirates and then reinstall it before rerunning this installer."
 NoYPPJ16:
 DetailPrint "Found YPP in $YPPDIR"
 FunctionEnd
@@ -70,17 +70,17 @@ FunctionEnd
 Function CopyJRE
 CreateDirectory $INSTDIR\jre
 CopyFiles $JRE\*.* $INSTDIR\jre
-File /oname=$INSTDIR\jre\lib\ext\PCTB-Uploader.jar PCTB-Uploader.jar
-File /oname=$INSTDIR\jre\lib\ext\PCTB-ControlPanel.jar PCTB-ControlPanel.jar
+File /oname=$INSTDIR\jre\lib\ext\Jarrg-Uploader.jar Jarrg-Uploader.jar
+File /oname=$INSTDIR\jre\lib\ext\Jarrg-ControlPanel.jar Jarrg-ControlPanel.jar
 File /oname=$INSTDIR\jre\lib\accessibility.properties accessibility.properties
 FunctionEnd
 
 Function YPPShortcuts
 SetOutPath $YPPDIR
-CreateShortCut "$DESKTOP\JPCTB.lnk" "$INSTDIR\jre\bin\javaw.exe" \
+CreateShortCut "$DESKTOP\JARRG.lnk" "$INSTDIR\jre\bin\javaw.exe" \
 "-jar getdown-dop.jar ." "$YPPDIR\app_icon.ico" 0 SW_SHOWNORMAL
-CreateShortCut "$SMPROGRAMS\JPCTB.lnk" "$INSTDIR\jre\bin\javaw.exe" \
+CreateShortCut "$SMPROGRAMS\JARRG.lnk" "$INSTDIR\jre\bin\javaw.exe" \
 "-jar getdown-dop.jar ." "$YPPDIR\app_icon.ico" 0 SW_SHOWNORMAL
-CreateShortCut "$SMPROGRAMS\JPCTB Control Panel.lnk" \
+CreateShortCut "$SMPROGRAMS\JARRG Control Panel.lnk" \
 "$INSTDIR\jre\bin\javaw.exe" "com.tedpearson.ypp.market.ControlPanel"
 FunctionEnd