Tidy-up and clarifications

svn path=/trunk/netsurf/; revision=6596

1 files changed, 47 insertions, 41 deletions

diff --git a/amiga/dist/Install b/amiga/dist/Install
index 85277d73c..c81112ee4 100755
--- a/amiga/dist/Install
+++ b/amiga/dist/Install
@@ -113,12 +113,15 @@
 
 (set @default-dest
 	(askdir
-		(prompt "Where would you like to install NetSurf?")
+		(prompt "Where would you like to install NetSurf?\n"
+				"(a drawer will not be created)")
 		(help @askdir-help)
 		(default @default-dest)
 	)
 )
 
+(complete 5)
+
 (working "Checking existing installation...")
 (set #icon-exists (exists (tackon @default-dest "NetSurf.info")))
 (set osver (getversion))
@@ -154,6 +157,8 @@
 	)
 )
 
+(complete 10)
+
 (if (AND (> @user-level 0) (<> #cairo-name ""))
 	(
 		(set #cairo-version
@@ -170,6 +175,37 @@
 	)
 )
 
+(complete 15)
+
+(set #options-exist (exists (tackon @default-dest "Resources/Options")))
+
+(if (= #options-exist 0)
+	(
+		(if (exists "TBimages:" (noreq))
+			(set #aiss-theme "AISS")
+		)
+
+		(set #themename
+   			(askchoice
+  				(prompt "Please select theme")
+ 	      		(help "AISS theme requires AISS (and def_pointers for 32-bit "
+						"pointers), and will only be shown as an option if "
+						"AISS is installed.\n\n"
+						@askchoice-help)
+				(choices "Default" #aiss-theme)
+       			(default 0)
+   			)
+		)
+
+		(select #themename
+			(set #theme "Resources/Themes/Default")
+			(set #theme "Resources/Themes/AISS")
+		)
+	)
+)
+
+(complete 20)
+
 (set #netsurf-name (select #cairo-version "NetSurf" "NetSurf_Cairo"))
 
 (if (= #AutoInstall 0)
@@ -192,7 +228,7 @@
 	)
 )
 
-(complete 20)
+(complete 40)
 
 (copyfiles
 	(prompt "Copying files")
@@ -204,54 +240,24 @@
 ;	(all)
 )
 
-(complete 50)
+(set #complete 60)
 
 (if (= #cairo-version 1)
 	(
 		(working "Copying Shared Objects")
 
-		(p_copysobj "libc.so")
-		(p_copysobj "libgcc.so")
-		(p_copysobj "libjpeg.so")
-		(p_copysobj "libpthread.so")
-
-		; This is only needed for Cairo, but we have a newer version so why not?
-		(p_copysobj "libexpat.so")
-
-		; Following two are included with OS4.1
-		; until I have something newer they aren't in the archive
-		;(p_sodatecopy "libcurl-7.16.so")
-		;(p_sodatecopy "libssl-0.9.8.so")
+		(foreach "SObjs" "#?.so"
+			(complete #complete)
+			(p_copysobj @each-name)
+			(set #complete (+ #complete 5))
+		)
 	)
 )
 
-(complete 70)
-
-(set #options-exist (exists (tackon @default-dest "Resources/Options")))
+(complete 90)
 
-(if (= #options-exist 0)
+(if #theme
 	(
-		(if (exists "TBimages:" (noreq))
-			(set #aiss-theme "AISS")
-		)
-
-		(set #themename
-   			(askchoice
-  				(prompt "Please select theme")
- 	      		(help "AISS theme requires AISS (and def_pointers for 32-bit "
-						"pointers), and will only be shown as an option if "
-						"AISS is installed.\n\n"
-						@askchoice-help)
-				(choices "Default" #aiss-theme)
-       			(default 0)
-   			)
-		)
-
-		(select #themename
-			(set #theme "Resources/Themes/Default")
-			(set #theme "Resources/Themes/AISS")
-		)
-
 		(set #theme-icon (tackon @default-dest (tackon #theme "NetSurf.info")))
 		(set #icon-exists (exists #theme-icon))
 
@@ -276,7 +282,7 @@
 	)
 )
 
-(complete 90)
+(complete 95)
 
 (working "Setting MIME types")
 (p_setmimetype "css" "text/css")