[or-cvs] r9162: - Changes to vidalia conf file. A few install cleaup modific (in torpedo/trunk/src: . install)

[sn275 at seul.org]

Author: sn275
Date: 2006-12-20 15:11:16 -0500 (Wed, 20 Dec 2006)
New Revision: 9162

Modified:
   torpedo/trunk/src/Changelog
   torpedo/trunk/src/install/torpedo.nsi
Log:
- Changes to vidalia conf file. A few install cleaup modifications, to remove confusing '\' in the installation path.

  To run a demo, build the nsis script in the dependencies directory,
  and have a go!




Modified: torpedo/trunk/src/Changelog
===================================================================
--- torpedo/trunk/src/Changelog	2006-12-20 17:05:54 UTC (rev 9161)
+++ torpedo/trunk/src/Changelog	2006-12-20 20:11:16 UTC (rev 9162)
@@ -1,3 +1,13 @@
+2006-12-20    <sn275 at SERAPH>
+
+	* install/torpedo.nsi: Removed uninstall sections, repaired
+	path-names.  
+
+	* install/dependencies: Added tor/privoxy/vidalia image
+	with conf file modifications for relative Tor path.
+	Tested with firefox. This should work for a functional demo.
+	
+
 2006-10-24    <sn275 at SERAPH>
 
 	* install/torpedo.nsi: Removed license 'I decline/accept'

Modified: torpedo/trunk/src/install/torpedo.nsi
===================================================================
--- torpedo/trunk/src/install/torpedo.nsi	2006-12-20 17:05:54 UTC (rev 9161)
+++ torpedo/trunk/src/install/torpedo.nsi	2006-12-20 20:11:16 UTC (rev 9162)
@@ -46,7 +46,7 @@
   ;Default installation folder
   InstallDir "$PROGRAMFILES\Torpedo"
 
-
+LicenseForceSelection off
 ;--------------------------------
 ;Interface Settings
 
@@ -56,17 +56,12 @@
 ;Pages
 
   !insertmacro MUI_PAGE_WELCOME
-  !insertmacro MUI_PAGE_LICENSE "license.txt"
+  !insertmacro MUI_PAGE_LICENSE "license.txt" 
   !insertmacro MUI_PAGE_COMPONENTS
   !insertmacro MUI_PAGE_DIRECTORY
   !insertmacro MUI_PAGE_INSTFILES
   !insertmacro MUI_PAGE_FINISH
 
-  !insertmacro MUI_UNPAGE_WELCOME
-  !insertmacro MUI_UNPAGE_CONFIRM
-  !insertmacro MUI_UNPAGE_INSTFILES
-  !insertmacro MUI_UNPAGE_FINISH
-
 ;--------------------------------
 ;Languages
 
@@ -78,7 +73,7 @@
 Section "Tor (Required)" Tor
 
   SectionIn RO	
-  SetOutPath "$INSTDIR/Tor"
+  SetOutPath "$INSTDIR\\Tor"
 
   ; Pick up distribution files from here
 
@@ -89,24 +84,18 @@
 
 Section "Vidalia" Vidalia
 
-  SetOutPath "$INSTDIR/Vidalia"
+  SetOutPath "$INSTDIR\\Vidalia"
 
   ; Pick up distribution files from here
   ;cd dependencies
 
   FILE /a /r "dependencies\Vidalia\*.*"
 
-  ;Store installation folder
-  ;WriteRegStr HKCU "Software\Modern UI Test" "" $INSTDIR
-
-  ;Create uninstaller
-  ;WriteUninstaller "$INSTDIR\Uninstall.exe"
-
 SectionEnd
 
 Section "Privoxy" Privoxy
 
-  SetOutPath "$INSTDIR/Privoxy"
+  SetOutPath "$INSTDIR\\Privoxy"
 
   ; Pick up distribution files from here
 
@@ -119,10 +108,10 @@
 ;Descriptions
 
   ;Language strings
-  LangString DESC_SecDummy ${LANG_ENGLISH} "Tor"
+  LangString DESC_Tor ${LANG_ENGLISH} "Tor"
 
   ;Assign language strings to sections
   !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-    !insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
+    !insertmacro MUI_DESCRIPTION_TEXT ${Tor} $(DESC_Tor)
   !insertmacro MUI_FUNCTION_DESCRIPTION_END
-
+