From 61b5939b6119ab46762e05d6098ff27113df818e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sm=C3=A1ri=20McCarthy?= Date: Mon, 4 Aug 2014 17:37:48 +0100 Subject: [PATCH] Shortcuts and paths on Windows --- mp.cmd | 2 +- packages/windows/mailpile.nsi | 12 +++++++++--- packages/windows/mailpile_logo.bmp | Bin 29258 -> 22042 bytes 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mp.cmd b/mp.cmd index 1d13c9b9c..dd57d27d9 100644 --- a/mp.cmd +++ b/mp.cmd @@ -1,6 +1,6 @@ @echo off set PATH=%PATH%;GnuPG\;OpenSSL\; -set PYTHONPATH=%~dp0 +set PYTHONPATH=%~dp0;%~dp0\GnuPG\;%~dp0\OpenSSL\; if exist python27\python.exe ( set PYTHONBIN=python27\python.exe ) else if exist c:\python27\python.exe ( diff --git a/packages/windows/mailpile.nsi b/packages/windows/mailpile.nsi index 5672c30d2..6ca4b416c 100644 --- a/packages/windows/mailpile.nsi +++ b/packages/windows/mailpile.nsi @@ -33,12 +33,16 @@ Section WriteRegStr HKCU "Software\Mailpile" "" $INSTDIR - createShortCut "$SMPROGRAMS\Mailpile.lnk" "$INSTDIR\mailpile\mp.cmd" # Call startup script... - File /r /x packages /x .git "../../../Mailpile/*" File /r "GnuPG" File /r "OpenSSL" File /r "Python27" + File "mailpile.ico" + + createDirectory "$SMPROGRAMS\Mailpile" + createShortCut "$SMPROGRAMS\Mailpile\Start Mailpile.lnk" "$INSTDIR\mp.cmd" "" "$INSTDIR\mailpile.ico" # Call startup script... + WriteINIStr "$SMPROGRAMS\Mailpile\Open Mailpile.url" "InternetShortcut" "URL" "http://localhost:33411" + WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Run" \ "Mailpile" "$INSTDIR\mp.cmd" @@ -47,7 +51,9 @@ SectionEnd Section "un.Uninstall" RMDir "$INSTDIR" - Delete "$SMPROGRAMS\Mailpile.lnk" + Delete "$SMPROGRAMS\Mailpile\Start Mailpile.lnk" + Delete "$SMPROGRAMS\Mailpile\Open Mailpile.url" + RMDir "$SMPROGRAMS\Mailpile" DeleteRegKey /ifempty HKCU "Software\Mailpile" SectionEnd diff --git a/packages/windows/mailpile_logo.bmp b/packages/windows/mailpile_logo.bmp index d7f0baf1758e5d21fb0e3058b06f81fd5a7615d1..4230a40b753c2aca4df61325fc1ba914db9d33f1 100644 GIT binary patch literal 22042 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 S;?llNyr~0I2c{0xI`BU>FGk-0