From 08694bf813527ffbbb0eab41c34210e62cbbd2f8 Mon Sep 17 00:00:00 2001
From: Roland Walker <walker@pobox.com>
Date: Thu, 6 Feb 2014 07:26:29 -0500
Subject: [PATCH] devscript: add new id and app sources

for list_apps_in_pkg and list_ids_in_pkg
---
 developer/bin/list_apps_in_pkg | 8 ++++++++
 developer/bin/list_ids_in_pkg  | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/developer/bin/list_apps_in_pkg b/developer/bin/list_apps_in_pkg
index 667da5b826..1ae8e8c2a9 100755
--- a/developer/bin/list_apps_in_pkg
+++ b/developer/bin/list_apps_in_pkg
@@ -59,6 +59,13 @@ app_source_4 () {
       'while (m{path\s*=\s*"([^"]+\.app)"}sg) { my $p = $1; $p =~ s{\A.*/}{}; print "$p\n" }';
 }
 
+app_source_5 () {
+    /usr/bin/find "$pkgdir" -name Archive.pax.gz -print0  |           \
+    /usr/bin/xargs -0 -n1 -I{} sh -c                                  \
+      "/usr/bin/gunzip -c '{}' | /bin/pax | /usr/bin/egrep '\.app'" | \
+    /usr/bin/perl -pe 's{\A.*/([^/]+\.app).*\Z}{$1}';
+}
+
 merge_sources () {
     /usr/bin/sort | /usr/bin/uniq
 }
@@ -138,6 +145,7 @@ _list_apps_in_pkg () {
       app_source_3;
       if [[ -n "$opt_lax" ]]; then
           app_source_4;
+          app_source_5;
       fi
     } |                \
     merge_sources |    \
diff --git a/developer/bin/list_ids_in_pkg b/developer/bin/list_ids_in_pkg
index 3fc66c6581..daec30978c 100755
--- a/developer/bin/list_ids_in_pkg
+++ b/developer/bin/list_ids_in_pkg
@@ -27,6 +27,12 @@ bundle_id_source_1 () {
       'while (m{<pkg-info.*?\sid(?:entifier)?\s*=\s*"([^"]*?)"}sg) { print "$1\n" }'
 }
 
+bundle_id_source_2 () {
+    /usr/bin/find "$pkgdir" -name Info.plist -print0 |                                 \
+    /usr/bin/xargs -0 /usr/bin/perl -0777 -ne                                          \
+      'while (m{<key>\s*CFBundleIdentifier\s*</key>\s*<string>([^<]+?)</string>}sg) { print "$1\n" }'
+}
+
 merge_sources () {
     /usr/bin/sort | /usr/bin/uniq
 }
@@ -60,6 +66,7 @@ _list_ids_in_pkg () {
     {
       # emit strings that look like bundle ids
       bundle_id_source_1;
+      bundle_id_source_2;
     } |                     \
     merge_sources |         \
     clean_sources |         \