pas d'analyse d'argument pour ci, cu, composer

runphp/runphp

@@ -467,9 +467,11 @@ OPTIONS
 
 function host_docker_run() {
     # lancer une commande avec docker
-    if [ "$1" == composer ]; then
-        : # pas d'analyse d'argument pour composer
-    else
+    case "$1" in
+    ci|cu|composer)
+        : # pas d'analyse d'argument pour les commandes composer
+        ;;
+    *)
         SOPTS=+w:
         LOPTS=help,chdir:,no-use-rslave
         args="$(getopt -n "$MYNAME" -o "$SOPTS" -l "$LOPTS" -- "$@")" || exit 1; eval "set -- $args"
@@ -513,7 +515,7 @@ OPTIONS
             esac
             shift
         done
-    fi
+    esac
 
     args=(
         run -it --rm
@@ -589,43 +591,43 @@ function container_exec() {
         fi
     fi
 
-    if [ "$1" == composer ]; then
-        : # pas d'analyse d'argument pour composer
-    else
-        SOPTS=+w:
-        LOPTS=chdir:
-        args="$(getopt -n "$MYNAME" -o "$SOPTS" -l "$LOPTS" -- "$@")" || exit 1; eval "set -- $args"
-
-        chdir=
-        action=
-        while [ $# -gt 0 ]; do
-            case "$1" in
-            --) shift; break;;
-            -w|--chdir) shift; chdir="$1";;
-            *) die "$1: option non configurée";;
-            esac
-            shift
-        done
-    fi
-
-    if [ $# -eq 0 ]; then
-        die "no command specified"
-    elif [ "$1" == ci ]; then
+    # pour les commandes suivantes, pas d'analyse d'argument
+    case "$1" in
+    ci)
         eecho "== installing composer dependencies"
         shift
         composer i "$@"
-    elif [ "$1" == cu ]; then
+        ;;
+    cu)
         eecho "== upgrading composer dependencies"
         shift
         composer u "$@"
-    elif [ "$1" == composer ]; then
+        ;;
+    composer)
         "$@"
-    else
-        if [ -n "$chdir" ]; then
-            cd "$chdir" || exit 1
-        fi
-        exec "$@"
+        ;;
+    esac
+
+    SOPTS=+w:
+    LOPTS=chdir:
+    args="$(getopt -n "$MYNAME" -o "$SOPTS" -l "$LOPTS" -- "$@")" || exit 1; eval "set -- $args"
+
+    chdir=
+    action=
+    while [ $# -gt 0 ]; do
+        case "$1" in
+        --) shift; break;;
+        -w|--chdir) shift; chdir="$1";;
+        *) die "$1: option non configurée";;
+        esac
+        shift
+    done
+
+    [ $# -gt 0 ] || die "no command specified"
+    if [ -n "$chdir" ]; then
+        cd "$chdir" || exit 1
     fi
+    exec "$@"
 }
 
 ################################################################################