feat: skip first non-option verb of wrapped pip command for optimize flagging

Author: autumnjolitz

chroot-pip.sh

@@ -85,21 +85,37 @@ if [ $PIP_OPTIMIZE = '1' ]; then
     AFTER_PACKAGES=$(mktemp)
     python -m pip freeze >"$BEFORE_PACKAGES"
 fi
-
+set -x
 case "$@" in
     *'--force-reinstall'*|optimize*)
+    maybe_packages=
+    index=-1
     for package_name in $@
     do
-        if case "$package_name" in '-'*) false ;; *) true ;; esac ; then
+        if ! case "$package_name" in '-'*) false ;; *) true ;; esac ; then
+            continue
+        fi
+        index=$(expr $index \+ 1)
+        if [ $index -eq 0 ]; then
+            continue
+        fi
+        maybe_packages="${maybe_packages} $package_name"
+    done
+    package_name=
+    if [ x$maybe_packages != x ]; then
+        for package_name in $maybe_packages
+        do
+            # if the package is already installed, flag it
+            # as if it wasn't installed so we can optimize it
             if >/dev/null pip show "${package_name}"; then
                 sed -i'' '/^'"${package_name}"'==/d' $BEFORE_PACKAGES
             fi
-        fi
-    done
+        done
+    fi
     ;;
 esac
-
-if [ $1 = optimize ]; then
+set +x
+if [ x$1 = xoptimize ]; then
     shift
     if [ x"$@" = x ]; then
         >&2 echo 'optimize [PACKAGE] [PACKAGE2] ... [PACKAGEN]