From 18ca27a56f4b5b0f2a788e23ada0cdd843011a0e Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sat, 2 Jul 2011 22:21:20 +0000 Subject: Don't prompt for build selection if there is no static build present svn path=/trunk/netsurf/; revision=12560 --- amiga/dist/Install | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/amiga/dist/Install b/amiga/dist/Install index 48edffb7c..a95dd1a6c 100755 --- a/amiga/dist/Install +++ b/amiga/dist/Install @@ -304,18 +304,23 @@ (set #icon-exists (exists (tackon @default-dest "NetSurf.info"))) (set osver (getversion)) (set osver (/ osver 65536)) +(set #versions-available 0) -(if (>= osver 53) +(if (exists "NetSurf") ( - (if (= #AutoInstall 0) - ( - (set #cairo-name "Shared objects/part-Cairo") - ) - ;else - ( - (set #cairo-name "") - ) - ) + (set #static-name "Static/graphics.library") + (set #versions-available (+ #versions-available 1)) + ) + ; else + ( + (set #static-name "") + ) +) + +(if (AND (>= osver 53) (exists "NetSurf-Cairo")) + ( + (set #cairo-name "Shared objects/part-Cairo") + (set #versions-available (+ #versions-available 1)) (set #cairo-version 1) ) ; else @@ -325,18 +330,19 @@ ) ) +(transcript "Versions avaiable for install: " #versions-available " " #static-name " " #cairo-name) + (complete 10) -(if (AND (> @user-level 0) (<> #cairo-name "")) +(if (AND (> @user-level 0) (> #versions-available 1)) ( (set #cairo-version (askchoice (prompt "Which version of NetSurf would you like to install?") (help "The Cairo/shared objects version has better rendering " - "of some graphical elements, and supports SVG. However, " - "some users report problems with the use of shared objects.\n\n" + "of some graphical elements, and supports SVG.\n\n" @askchoice-help) - (choices "Static/graphics.library" #cairo-name) + (choices #static-name #cairo-name) (default #cairo-version) ) ) -- cgit v1.2.3