still debugging the ci-build script (take 3)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14962 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 10 insertions, 7 deletions

diff --git a/tools/ci-build b/tools/ci-build
index b10490d010..4bb2593eb6 100755
--- a/tools/ci-build
+++ b/tools/ci-build
@@ -29,15 +29,21 @@ error () {
 }
 
 #########################################################################
-
 # be verbose
 set -x
 
 #########################################################################
+# "Parse" mandatory command-line arguments.
+
+arch="$1"
+branch="$2"
+shift 2
+
+#########################################################################
 # If we are called from a Windows batch script, we must set up the
 # Unix environment variables (e.g. PATH).
 
-case "$1" in
+case "$arch" in
   bsd|macos|linux) ;;
   cygwin|mingw|mingw64)
     . /etc/profile
@@ -53,7 +59,7 @@ case "$1" in
     . "$HOME/.profile"
     . "$HOME/.msenv64"
   ;;
-  *) error "unknown architecture: $1";;
+  *) error "unknown architecture: $arch";;
 esac
 
 #########################################################################
@@ -114,13 +120,10 @@ esac
 cd "$workdir"
 
 #########################################################################
-# parse command line (has to be done after the "cd")
+# parse optional command-line arguments (has to be done after the "cd")
 # Configure options are not allowed to have spaces or special characters
 # for the moment. We'll fix that when needed.
-arch="$1"
-branch="$2"
 confoptions=""
-shift 2
 while [ $# -gt 0 ]; do
   case $1 in
     -conf) confoptions="$confoptions $2"; shift 2;;