[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r1287: Make sure $APPDATA\Vidalia exists before trying to create $A (trunk/pkg/win32/bundle)



Author: edmanm
Date: 2006-10-04 19:39:25 -0400 (Wed, 04 Oct 2006)
New Revision: 1287

Modified:
   trunk/pkg/win32/bundle/bundle.nsi
Log:
Make sure $APPDATA\Vidalia exists before trying to create $APPDATA\Vidalia\vidalia.conf and write the location of tor.exe into it. Otherwise, it fails and people on IRC get confused. I hate NSIS.

Modified: trunk/pkg/win32/bundle/bundle.nsi
===================================================================
--- trunk/pkg/win32/bundle/bundle.nsi	2006-10-04 23:06:10 UTC (rev 1286)
+++ trunk/pkg/win32/bundle/bundle.nsi	2006-10-04 23:39:25 UTC (rev 1287)
@@ -199,8 +199,14 @@
       Push "\\"
       Call StrRep
       Pop $R0 ; contains the modified version of $INSTDIR
+
+      SetShellVarContext current
+      IfFileExists "$APPDATA\Vidalia" EndIfConf
+        CreateDirectory "$APPDATA\Vidalia"
+      EndIfConf:
       WriteINIStr "$APPDATA\Vidalia\vidalia.conf" Tor TorExecutable "$R0\\Tor\\${TOR_EXEC}"
- 
+      SetShellVarContext all
+
       ; Write the uninstall keys for Windows  
       WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "DisplayName" "${VIDALIA_NAME} ${VIDALIA_VERSION}"
       WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "UninstallString" '"$INSTDIR\Vidalia\${VIDALIA_UNINST}"'