From bed1ad9e7948f1d3dee2cef8fd694e516d3f3258 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sat, 21 Feb 2009 16:18:59 +0000 Subject: Fix some things which didn't work correctly when installing over an existing install svn path=/trunk/netsurf/; revision=6591 --- amiga/dist/Install | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/amiga/dist/Install b/amiga/dist/Install index 378b7b2d6..fbcea167c 100755 --- a/amiga/dist/Install +++ b/amiga/dist/Install @@ -97,7 +97,7 @@ (source (tackon "SObjs/" #sobj)) (dest "SObjs:") (optional "nofail" "force") - (confirm) + (confirm "expert") ) ) ) @@ -139,22 +139,11 @@ (set #netsurf-exists (exists (tackon @default-dest "NetSurf"))) (if (<> #netsurf-exists 0) ( - (set #netsurf-size (getsize (tackon @default-dest "NetSurf"))) + ; Guess if the installed version is static, if it + ; is bigger than 9MB then it probably is! - ; This loop checks the installed version of NetSurf against known - ; filesizes for non-Cairo versions. This isn't great as self-compiled - ; or non-release builds won't be picked up. - ; Below only contains latest dev snapshot as that is all I can find out. - ; Additional sizes can be added "1234" "5678" etc - ; We might be able to guess as the static build is always bigger (>8MB?) - - (set #loop 0) - (while (set #compare-size (select #loop "9646743")) - ( - (set #loop (+ #loop 1)) - (if (= #netsurf-size #compare-size) (set #cairo-version 0)) - ) - ) + (set #netsurf-size (getsize (tackon @default-dest "NetSurf"))) + (if (> #netsurf-size 9000000) (set #cairo-version 0)) ) ) ) -- cgit v1.2.3