Update to match upstream

alebcay · Mar 28, 2015 · d0a0a5e · d0a0a5e
1 parent fa2096f
commit d0a0a5e
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 132 deletions.
diff --git a/cdt.d/inspect.d/appids b/cdt.d/inspect.d/appids
@@ -134,7 +134,7 @@ _list_ids_in_app () {
 
 # process args
 if [[ $1 =~ ^-+h(elp)?$ || -z "$1" ]]; then
-    printf "cdt inspect appids <path.app>
+    printf "list_ids_in_app <path.app>
 Given a Application (app) bundle directory on disk, extract the
 associated app Bundle ID, which may be useful in a Cask uninstall
 stanza, eg
@@ -153,4 +153,4 @@ fi
 # dispatch main
 _list_ids_in_app "${@}"
 
-#
+#
diff --git a/cdt.d/inspect.d/kextids b/cdt.d/inspect.d/kextids
@@ -68,7 +68,7 @@ _list_id_in_kext () {
 
 # process args
 if [[ $1 =~ ^-+h(elp)?$ || -z "$1" ]]; then
-    printf "cdt inspect kextids <file.kext>
+    printf "list_id_in_kext <file.kext>
 Given a Kernel Extension (kext) bundle dir on disk, extract the
 associated kext Bundle ID, which may be useful in a Cask uninstall
 stanza, eg
@@ -85,4 +85,4 @@ fi
 # dispatch main
 _list_id_in_kext "${@}"
 
-#
+#
diff --git a/cdt.d/inspect.d/pkgapps b/cdt.d/inspect.d/pkgapps
@@ -7,9 +7,9 @@
 ### settings
 ###
 
-set -e # exit on any uncaught error
-set +o histexpand # don't expand history expressions
-shopt -s nocasematch # case-insensitive regular expressions
+set -e                # exit on any uncaught error
+set +o histexpand     # don't expand history expressions
+shopt -s nocasematch  # case-insensitive regular expressions
 
 ###
 ### global variables
@@ -33,134 +33,112 @@ warn () {
     message="${message%"${message##*[![:space:]]}"}"
     printf "%s\n" "$message" 1>&2
 }
-
 die () {
     warn "$@"
     exit 1
 }
-
 app_source_1 () {
-    /usr/bin/find "$pkgdir" -name PackageInfo -print0 | \
-    "$xargs" -0 /usr/bin/perl -0777 -ne \
+    /usr/bin/find "$pkgdir" -name PackageInfo -print0 |   \
+    "$xargs" -0 /usr/bin/perl -0777 -ne                   \
       'while (m{<pkg-info[^\n]*install-location="/Applications".*?path\s*=\s*"([^"]+)"}sg) { my $p = $1; $p =~ s{\A.*/}{}; print "$p\n" }';
 }
-
 app_source_2 () {
-    /usr/bin/find "$pkgdir" -name PackageInfo -print0 | \
-    "$xargs" -0 /usr/bin/perl -0777 -ne \
+    /usr/bin/find "$pkgdir" -name PackageInfo -print0  |  \
+    "$xargs" -0 /usr/bin/perl -0777 -ne                   \
       'while (m{<pkg-info[^\n]*install-location="/".*?path\s*=\s*"./Applications/([^"]+)"}sg) { my $p = $1; $p =~ s{\A.*/}{}; print "$p\n" }';
 }
-
 app_source_3 () {
-    /usr/bin/find "$pkgdir" -type d -name '*.app' | \
+    /usr/bin/find "$pkgdir" -type d -name '*.app' |       \
     perl -pe 's{\A.*/}{}';
 }
-
 app_source_4 () {
-    /usr/bin/find "$pkgdir" -name PackageInfo -print0 | \
-    "$xargs" -0 /usr/bin/perl -0777 -ne \
+    /usr/bin/find "$pkgdir" -name PackageInfo -print0  |  \
+    "$xargs" -0 /usr/bin/perl -0777 -ne                   \
       '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 | \
-    "$xargs" -0 -n1 -I{} /bin/bash -c \
+    /usr/bin/find "$pkgdir" -name Archive.pax.gz -print0  |           \
+    "$xargs" -0 -n1 -I{} /bin/bash -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
 }
-
 mark_up_sources () {
-    /usr/bin/perl -pe 's{\n}{\000}sg' | \
-    "$xargs" -0 -I{} -n1 /bin/bash -c \
+    /usr/bin/perl -pe 's{\n}{\000}sg' |                     \
+    "$xargs" -0 -I{} -n1 /bin/bash -c                       \
       'printf "{}"; /bin/test -n "$(/usr/bin/find /Applications -type d -maxdepth 3 -name "{}" -print0; /usr/bin/find ~/Applications -type d -maxdepth 3 -name "{}")" && printf " (+)"; printf "\n"'
 }
-
 process_args () {
     local arg
     if [[ "$#" -eq 0 ]]; then
-die "ERROR: A file argument is required"
+        die "ERROR: A file argument is required"
     else
-opt_pkg="${!#}" # last arg
+        opt_pkg="${!#}"   # last arg
     fi
-for arg in "$@"; do
-if [[ $arg =~ ^-+h(elp)?$ ]]; then
-printf "list_apps_in_pkg [ -lax ] <file.pkg>
-
+    for arg in "$@"; do
+        if [[ $arg =~ ^-+h(elp)?$ ]]; then
+            printf "list_apps_in_pkg [ -lax ] <file.pkg>
 Given a package file, extract a list of candidate App names from
 inside the pkg, which may be useful for naming a Cask.
-
 The given package file need not be installed.
-
 If an App of the listed name is already installed in /Applications
 or ~/Applications, it will be followed by a plus symbol '(+)' in
-the output. This can be verified via 'ls' or the Finder.
-
+the output.  This can be verified via 'ls' or the Finder.
 Arguments
-
--lax Be less selective in looking for App names. Generate
-more, but less accurate, guesses.
-
+   -lax   Be less selective in looking for App names.  Generate
+          more, but less accurate, guesses.
 Bugs: This script is imperfect.
-- It does not fully parse PackageInfo files
-- An App can be hidden within a nested archive and not found
-- Some pkg files simply don't contain any Apps
+ - It does not fully parse PackageInfo files
+ - An App can be hidden within a nested archive and not found
+ - Some pkg files simply don't contain any Apps
 
 See CONTRIBUTING.md and 'man pkgutil' for more information.
 
 "
             exit
-elif [[ $arg =~ ^-+lax$ ]]; then
-opt_lax='true'
+        elif [[ $arg =~ ^-+lax$ ]]; then
+            opt_lax='true'
         elif [[ "$arg" = "$opt_pkg" ]]; then
-true
-else
-die "ERROR: Unknown argument '$arg'"
+            true
+        else
+            die "ERROR: Unknown argument '$arg'"
         fi
-done
-if [[ -h "$opt_pkg" ]]; then
-opt_pkg="$(/usr/bin/readlink "$opt_pkg")"
+    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'"
+    if ! [[ -e "$opt_pkg" ]]; then
+        die "ERROR: No such pkg file: '$opt_pkg'"
     fi
 }
-
 ###
 ### main
 ###
-
 _list_apps_in_pkg () {
-
     if [[ -d "$opt_pkg" ]]; then
-pkgdir="$opt_pkg"
+        pkgdir="$opt_pkg"
     else
-local tmpdir="$(usr/bin/mktemp -d -t list_ids_in_pkg)"
+        local tmpdir="$(/usr/bin/mktemp -d -t list_ids_in_pkg)"
         trap "/bin/rm -rf -- '$tmpdir'" EXIT
         pkgdir="$tmpdir/unpack"
         /usr/sbin/pkgutil --expand "$opt_pkg" "$tmpdir/unpack" "$pkgdir"
     fi
-
     {
       # strings that look like App names (Something.app)
       app_source_1;
       app_source_2;
       app_source_3;
       if [[ -n "$opt_lax" ]]; then
-app_source_4;
+          app_source_4;
           app_source_5;
       fi
-    } | \
-    merge_sources | \
+    } |                \
+    merge_sources |    \
     mark_up_sources
 }
-
 process_args "${@}"
-
 # dispatch main
 _list_apps_in_pkg
-
-#
+#
diff --git a/cdt.d/inspect.d/pkgids b/cdt.d/inspect.d/pkgids
@@ -83,7 +83,7 @@ _list_ids_in_pkg () {
 
 # process args
 if [[ $1 =~ ^-+h(elp)?$ || -z "$1" ]]; then
-    printf "cdt inspect pkgids <file.pkg>
+    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'
@@ -105,4 +105,4 @@ fi
 # dispatch main
 _list_ids_in_pkg "${@}"
 
-#
+#