From b8dde8e473fb39decc931fe4ff9ee8ad552b8f26 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sat, 25 Apr 2009 21:47:39 +0000
Subject: [PATCH] Post-2.0 release changes: stripped static binary in only 5MB
 Fix AutoInstall copying NetSurf_Cairo without renaming Fix installing on
 systems without AISS

svn path=/trunk/netsurf/; revision=7315
---
 amiga/dist/Install | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/amiga/dist/Install b/amiga/dist/Install
index 84be14eb8..88162cf18 100755
--- a/amiga/dist/Install
+++ b/amiga/dist/Install
@@ -156,16 +156,14 @@
 		)
 		(set #cairo-version 1)
 		(set #netsurf-exists (exists (tackon @default-dest "NetSurf")))
-;		(if (<> #netsurf-exists 0)
-;			(
+		(if (<> #netsurf-exists 0)
+			(
 				; Guess if the installed version is static, if it
-				; is bigger than 9MB then it probably is!
-; Comment this out temporarily as we want AutoInstall to update to the Cairo
-; version at this stage, as it hasn't seen a snapshot release yet.
-;				(set #netsurf-size (getsize (tackon @default-dest "NetSurf")))
-;				(if (> #netsurf-size 9000000) (set #cairo-version 0))
-;			)
-;		)
+				; is bigger than 5MB then it probably is!
+				(set #netsurf-size (getsize (tackon @default-dest "NetSurf")))
+				(if (> #netsurf-size 5000000) (set #cairo-version 0))
+			)
+		)
 	)
 	; else
 	(
@@ -195,6 +193,7 @@
 (complete 15)
 
 (set #options-exist (exists (tackon @default-dest "Resources/Options")))
+(set #aiss-theme "")
 
 (if (= #options-exist 0)
 	(
@@ -234,14 +233,24 @@
 			(source #netsurf-name)
 			(dest @default-dest)
 			(newname "NetSurf")
-			(infos)
 			(optional "askuser" "force" "oknodelete")
 			(confirm "expert")
 		)
 	)
 ;else
 	(
-		(run "CopyStore " #netsurf-name " " @default-dest)
+		(copyfiles
+			(prompt "Please check the version of NetSurf you are copying against "
+					"any which might already be installed.")
+			(help @copyfiles-help)
+			(source #netsurf-name)
+			(dest "T:")
+			(newname "NetSurf")
+			(optional "force" "oknodelete")
+		)
+
+		(run "CopyStore T:NetSurf" @default-dest)
+		(delete "T:NetSurf")
 	)
 )
 
@@ -250,7 +259,7 @@
 (copyfiles
 	(prompt "Copying files")
 	(source "")
-	(choices "Resources" "Rexx" "NetSurf.guide" "NetSurf.readme")
+	(choices "Resources" "Rexx" "NetSurf.guide" "NetSurf.readme" "COPYING")
 	(help @copyfiles-help)
 	(dest @default-dest)
 	(infos)