[[ Merge ]] Port develop changes to scriptified installer

livecodeali · livecodeali · commit 01406d9618b3 · 2017-06-25T21:06:07.000+01:00
diff --git a/builder/installer/installeruistackbehavior.livecodescript b/builder/installer/installeruistackbehavior.livecodescript
@@ -453,8 +453,8 @@ command runFaceless
    local tOptions
    parseOptions tOptions
    if the result is not empty then
-      write "Usage: <exe> -noui [-location <path>] [-allusers] [-desktopshortcut] [-startmenu]" & return to stderr
-      exit runFaceless
+      write "Usage: <exe> -ui [-location <path>] [-allusers] [-desktopshortcut] [-startmenu]" & return to stderr
+      quit 1
    end if 
    
    -- Compute the target location based on install type, if non specified
@@ -478,7 +478,9 @@ end runFaceless
 
 private command parseOptions @rOptions
    local tIndex
-   put 3 into tIndex
+   -- Skip $0 (executable path) and $1 ('install')
+   -- '-ui' is not included in the cmd line arg vars
+   put 2 into tIndex
    repeat forever
       if tIndex >= $# then
          exit repeat
diff --git a/builder/installer/stackbehavior.livecodescript b/builder/installer/stackbehavior.livecodescript
@@ -26,15 +26,15 @@ on startup
    
    switch tAction
       case "install"
-         if $2 is "noui" then
+         if the environment is "installer command line" then
             runFacelessInstall
          else
             hide me
             send "runInstallerUI" to me in 0 millisecs
          end if
          break
       case "uninstall"
-         if $2 is "noui" then
+         if the environment is "installer command line" then
             runFacelessUninstall
          else
             hide me
@@ -117,7 +117,7 @@ command setTitleField pField, pTitle, pSubTitle
 end setTitleField
 
 on errorDialog pError
-   if $2 is "noui" then
+   if the environment is "installer command line" then
       write "[" && the internet date && "]" && ": ERROR " && pError & return to stdout
       quit 1
    else
