Use Copystore to copy SObjs when install triggered by AmiUpdate

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

1 files changed, 30 insertions, 14 deletions

diff --git a/amiga/dist/Install b/amiga/dist/Install
index 950d04f66..6dcb4baee 100755
--- a/amiga/dist/Install
+++ b/amiga/dist/Install
@@ -18,7 +18,7 @@
 
 	(if (= #sobj-version 0)
 		(
-			(transcript "Date compare copy " #sobj)
+			(transcript "Date compare " #sobj)
 
 			(if (exists (tackon "SObjs:" #sobj))
 				(
@@ -79,25 +79,41 @@
 
 			(if (<> #copy 0)
 				(
-					(copyfiles
-						(prompt "Copying " #sobj "...")
-						(help @copyfiles-help)
-						(source (tackon "SObjs/" #sobj))
-						(dest "SObjs:")
-						(optional "nofail" "force")
+					(if (<> #AutoInstall 1)
+						(
+							(copyfiles
+								(prompt "Copying " #sobj "...")
+								(help @copyfiles-help)
+								(source (tackon "SObjs/" #sobj))
+								(dest "SObjs:")
+								(optional "nofail" "force")
+							)
+						)
+						;else
+						(
+							(run "CopyStore SObjs/" #sobj " SObjs:")
+						)
 					)
 				)
 			)
 		)
 		; else if version info is available
 		(
-			(copylib
-				(prompt "Copying " #sobj "...")
-				(help @copylib-help)
-				(source (tackon "SObjs/" #sobj))
-				(dest "SObjs:")
-				(optional "nofail" "force")
-				(confirm "expert")
+			(if (<> #AutoInstall 1)
+				(
+					(copylib
+						(prompt "Copying " #sobj "...")
+						(help @copylib-help)
+						(source (tackon "SObjs/" #sobj))
+						(dest "SObjs:")
+						(optional "nofail" "force")
+						(confirm "expert")
+					)
+				)
+				;else
+				(
+					(run "CopyStore SObjs/" #sobj " SObjs:")
+				)
 			)
 		)
 	)