From bfdabf053ea3f447ed7341fa33a4153e42af67ad Mon Sep 17 00:00:00 2001
From: Yvo Mulder <ytbmulder@gmail.com>
Date: Wed, 27 Feb 2019 15:43:55 +0100
Subject: [PATCH] Add -lax argument to list_ids_in_pkg script (#59214)

* Add -lax argument to list_ids_in_pkg script

* Update list_ids_in_pkg
---
 developer/bin/list_ids_in_pkg | 103 ++++++++++++++++++++++------------
 1 file changed, 66 insertions(+), 37 deletions(-)

diff --git a/developer/bin/list_ids_in_pkg b/developer/bin/list_ids_in_pkg
index 0cdd7a5c80..2cefb28924 100755
--- a/developer/bin/list_ids_in_pkg
+++ b/developer/bin/list_ids_in_pkg
@@ -15,6 +15,8 @@ shopt -s nocasematch  # case-insensitive regular expressions
 ### global variables
 ###
 
+opt_lax=''
+opt_pkg=''
 pkgdir=''
 
 # prefer GNU xargs
@@ -50,22 +52,77 @@ mark_up_sources () {
       'printf "{}"; /usr/sbin/pkgutil --pkg-info "{}" >/dev/null 2>&1 && printf " (+)"; printf "\n"'
 }
 
+process_args () {
+    local arg
+    if [[ "$#" -eq 0 ]]; then
+        die "ERROR: A file argument is required"
+    else
+        opt_pkg="${!#}"   # last arg
+    fi
+    for arg in "$@"; do
+        if [[ $arg =~ ^-+h(elp)?$ ]]; then
+            printf "
+                list_ids_in_pkg [ -lax ] <file.pkg>
+
+                Given a package file, extract a list of candidate Package IDs
+                which may be useful in a Cask uninstall stanza, eg
+
+                    uninstall pkgutil: 'package.id.goes.here'
+
+                The given package file need not be installed.
+
+                The output of this script should be overly inclusive -- not
+                every candidate package id in the output will be needed at
+                uninstall time.
+
+                Package IDs designated by Apple or common development frameworks
+                will be excluded from the output. This can be turned off with
+                the -lax argument.
+
+                If a package id is already installed, it will be followed by
+                a plus symbol '(+)' in the output. This can be verified via
+                the command
+
+                    /usr/sbin/pkgutil --pkg-info 'package.id.goes.here'
+
+                Arguments
+
+                   -lax   Turn off filtering of Apple or common development
+                          framework package IDs from the output.
+
+                See CONTRIBUTING.md and 'man pkgutil' for more information.
+
+            " | sed -E 's/^ {16}//'
+            exit
+        elif [[ $arg =~ ^-+lax$ ]]; then
+            opt_lax='true'
+        elif [[ "$arg" = "$opt_pkg" ]]; then
+            true
+        else
+            die "ERROR: Unknown argument '$arg'"
+        fi
+    done
+    if [[ -h "$opt_pkg" ]]; then
+        opt_pkg="$(/usr/bin/readlink "$opt_pkg")"
+    fi
+    if ! [[ -e "$opt_pkg" ]]; then
+        die "ERROR: No such pkg file: '$opt_pkg'"
+    fi
+}
+
 ###
 ### main
 ###
 
 _list_ids_in_pkg () {
 
-    if [[ -d "$1" ]]; then
-        pkgdir="$1"
-        if [[ -h "$pkgdir" ]]; then
-            pkgdir="$(/usr/bin/readlink "$pkgdir")"
-        fi
+    if [[ -d "$opt_pkg" ]]; then
+        pkgdir="$opt_pkg"
     else
         local tmpdir="$(/usr/bin/mktemp -d -t list_ids_in_pkg)"
         trap "/bin/rm -rf -- '$tmpdir'" EXIT
         pkgdir="$tmpdir/unpack"
-        /usr/sbin/pkgutil --expand "$1" "$tmpdir/unpack" "$pkgdir"
+        /usr/sbin/pkgutil --expand "$opt_pkg" "$tmpdir/unpack" "$pkgdir"
     fi
 
     {
@@ -74,42 +131,14 @@ _list_ids_in_pkg () {
       bundle_id_source_2;
     } |                     \
     merge_sources |         \
-    clean_sources |         \
+    ( [[ ! "$opt_lax" ]] && clean_sources || cat ) | \
     mark_up_sources
 
 }
 
-# process args
-if [[ $1 =~ ^-+h(elp)?$ || -z "$1" ]]; then
-    printf "list_ids_in_pkg <file.pkg>
-
-Given a package file, extract a list of candidate Package IDs
-which may be useful in a Cask uninstall stanza, eg
-
-    uninstall pkgutil: 'package.id.goes.here'
-
-The given package file need not be installed.
-
-The output of this script should be overly inclusive -- not
-every candidate package id in the output will be needed at
-uninstall time.
-
-Package IDs designated by Apple or common development frameworks
-will be excluded from the output.
-
-If a package id is already installed, it will be followed by
-a plus symbol '(+)' in the output. This can be verified via
-the command
-
-    /usr/sbin/pkgutil --pkg-info 'package.id.goes.here'
-
-See CONTRIBUTING.md and 'man pkgutil' for more information.
-
-"
-    exit
-fi
+process_args "${@}"
 
 # dispatch main
-_list_ids_in_pkg "${@}"
+_list_ids_in_pkg
 
 #