sigh 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9589402f17e4e3c23d0511b977fa7346999dea3f
-  data.tar.gz: 8980cd98b9bd6e6ab7dd2dd7b73d1dc4ce292a93
+  metadata.gz: e49ced620631a80f353f66ce2aaec2eb7623fe89
+  data.tar.gz: 44753e2b434bf48330d3222265371d999b527535
 SHA512:
-  metadata.gz: b0933b80dfa931ab145d08c9c42229913ccecde99acf6060a3efb458a3b3648d49feb54c74af817640c31d26d8f5fa5f08e2a53df20646801ba7f731f1537deb
-  data.tar.gz: 4b9e228b65c5edef013145cde661982b30229a1e860f22b72c57fb68de3836e8439c930c73a181c9fd33df42a349e05383b188dc7549f50b4f078236f5a94a81
+  metadata.gz: ce2f1fecf07da5caa9b196081bd5a9363b87d6b69c3bd614dd9a8526584b38dfa8b518f6e5ecaf7b33eef2526ebd04ae6a6e07334b348aa702e7d420779b1248
+  data.tar.gz: b9a69234e758c2128ca442cc117f5259c6a7cd544bc3d937da5f73ef2ffc134b6f52a4f2e2425e925a2c9fdd5a768579de7127e02a5c52f5f14549173e2c42ec

data/bin/sigh

@@ -61,6 +61,7 @@ class SighApplication
       c.syntax = 'sigh resign'
       c.description = 'Resigns an existing ipa file with the given provisioning profile'
       c.option '-i', '--signing_identity STRING', String, 'The signing identity to use. Must match the one defined in the provisioning profile.'
+      c.option '-x', '--version_number STRING', String, 'Version number to force binary to use'
       c.option '-p', '--provisioning_profile PATH', String, '(or BUNDLE_ID=PATH) The path to the provisioning profile which should be used.'\
                'Can be provided multiple times if the application contains nested applications and app extensions, which need their own provisioning profile.'\
                'The path may be prefixed with a identifier in order to determine which provisioning profile should be used on which app.',

data/lib/assets/resign.sh

@@ -51,7 +51,7 @@
 # 3. fixed bug in packaging if -e flag is used
 # 4. renamed 'temp' directory and made it a variable so it can be easily modified
 # 5. various code formatting and logging adjustments
-# 
+#
 # new features October 2015
 # 1. now re-signs nested applications and app extensions, if present, prior to re-signing the application itself
 # 2. enables the -p option to be used more than once
@@ -63,11 +63,11 @@
 
 function checkStatus {
 
-if [ $? -ne 0 ];
-then
-    echo "Encountered an error, aborting!" >&2
-    exit 1
-fi
+    if [ $? -ne 0 ];
+    then
+        echo "Encountered an error, aborting!" >&2
+        exit 1
+    fi
 }
 
 if [ $# -lt 3 ]; then
@@ -87,6 +87,8 @@ RAW_PROVISIONS=()
 PROVISIONS_BY_ID=()
 DEFAULT_PROVISION=""
 TEMP_DIR="_floatsignTemp"
+# List of plist keys used for reference to and from nested apps and extensions
+NESTED_APP_REFERENCE_KEYS=(":WKCompanionAppBundleIdentifier" ":NSExtension:NSExtensionAttributes:WKAppBundleIdentifier")
 
 # options start index
 OPTIND=3
@@ -134,7 +136,7 @@ done
 shift $((OPTIND-1))
 
 NEW_FILE="$1"
-if [ -z "$NEW_FILE" ]; 
+if [ -z "$NEW_FILE" ];
 then
     echo "Output file name required" >&2
     exit 1
@@ -146,7 +148,7 @@ if [[ "${#RAW_PROVISIONS[*]}" == "0" ]]; then
 fi
 
 # Check for and remove the temporary directory if it already exists
-if [ -d "$TEMP_DIR" ]; 
+if [ -d "$TEMP_DIR" ];
 then
     echo "Removing previous temporary directory: '$TEMP_DIR'" >&2
     rm -Rf "$TEMP_DIR"
@@ -192,73 +194,73 @@ export PATH=$PATH:/usr/libexec
 # The first one may contain the wildcard character '*', in which case pattern matching will be used unless the third parameter is "STRICT"
 function does_bundle_id_match {
 
-if [[ "$1" == "$2" ]]; then
-    return 0
-elif [[ "$3" != STRICT && "$1" =~ \* ]]; then
-    local PATTERN0="${1//\./\\.}"       # com.example.*     -> com\.example\.*
-    local PATTERN1="${PATTERN0//\*/.*}" # com\.example\.*   -> com\.example\..*
-    if [[ "$2" =~ ^$PATTERN1$ ]]; then
+    if [[ "$1" == "$2" ]]; then
         return 0
+    elif [[ "$3" != STRICT && "$1" =~ \* ]]; then
+        local PATTERN0="${1//\./\\.}"       # com.example.*     -> com\.example\.*
+        local PATTERN1="${PATTERN0//\*/.*}" # com\.example\.*   -> com\.example\..*
+        if [[ "$2" =~ ^$PATTERN1$ ]]; then
+            return 0
+        fi
     fi
-fi
 
-return 1
+    return 1
 }
 
 # Find the provisioning profile for a given bundle identifier
 function provision_for_bundle_id {
 
-for ARG in "${PROVISIONS_BY_ID[@]}"; do
-    if does_bundle_id_match "${ARG%%=*}" "$1" "$2"; then
-        echo "${ARG#*=}"
-        break
-    fi
-done
+    for ARG in "${PROVISIONS_BY_ID[@]}"; do
+        if does_bundle_id_match "${ARG%%=*}" "$1" "$2"; then
+            echo "${ARG#*=}"
+            break
+        fi
+    done
 }
 
 # Find the bundle identifier contained inside a provisioning profile
 function bundle_id_for_provison {
 
-local FULL_BUNDLE_ID=`PlistBuddy -c 'Print :Entitlements:application-identifier' /dev/stdin <<< $(security cms -D -i "$1")`
-checkStatus
-echo "${FULL_BUNDLE_ID#*.}"
+    local FULL_BUNDLE_ID=`PlistBuddy -c 'Print :Entitlements:application-identifier' /dev/stdin <<< $(security cms -D -i "$1")`
+    checkStatus
+    echo "${FULL_BUNDLE_ID#*.}"
 }
 
 # Add given provisioning profile and bundle identifier to the search list
 function add_provision_for_bundle_id {
 
-local PROVISION="$1"
-local BUNDLE_ID="$2"
+    local PROVISION="$1"
+    local BUNDLE_ID="$2"
 
-local CURRENT_PROVISION=`provision_for_bundle_id "$BUNDLE_ID" STRICT`
+    local CURRENT_PROVISION=`provision_for_bundle_id "$BUNDLE_ID" STRICT`
 
-if [[ "$CURRENT_PROVISION" != "" && "$CURRENT_PROVISION" != "$PROVISION" ]]; then
-    echo "Conflicting provisioning profiles '$PROVISION' and '$CURRENT_PROVISION' for bundle identifier '$BUNDLE_ID'." >&2
-    exit 1
-fi
+    if [[ "$CURRENT_PROVISION" != "" && "$CURRENT_PROVISION" != "$PROVISION" ]]; then
+        echo "Conflicting provisioning profiles '$PROVISION' and '$CURRENT_PROVISION' for bundle identifier '$BUNDLE_ID'." >&2
+        exit 1
+    fi
 
-PROVISIONS_BY_ID+=("$BUNDLE_ID=$PROVISION")
+    PROVISIONS_BY_ID+=("$BUNDLE_ID=$PROVISION")
 }
 
 # Add given provisioning profile to the search list
 function add_provision {
 
-local PROVISION="$1"
+    local PROVISION="$1"
 
-if [[ "$1" =~ .+=.+ ]]; then
-    PROVISION="${1#*=}"
-    add_provision_for_bundle_id "$PROVISION" "${1%%=*}"
-elif [[ "$DEFAULT_PROVISION" == "" ]]; then
-    DEFAULT_PROVISION="$PROVISION"
-fi
+    if [[ "$1" =~ .+=.+ ]]; then
+        PROVISION="${1#*=}"
+        add_provision_for_bundle_id "$PROVISION" "${1%%=*}"
+    elif [[ "$DEFAULT_PROVISION" == "" ]]; then
+        DEFAULT_PROVISION="$PROVISION"
+    fi
 
-if [[ ! -e "$PROVISION" ]]; then
-    echo "Provisioning profile '$PROVISION' file does not exist" >&2
-    exit 1;
-fi
+    if [[ ! -e "$PROVISION" ]]; then
+        echo "Provisioning profile '$PROVISION' file does not exist" >&2
+        exit 1;
+    fi
 
-local BUNDLE_ID=`bundle_id_for_provison "$PROVISION"`
-add_provision_for_bundle_id "$PROVISION" "$BUNDLE_ID"
+    local BUNDLE_ID=`bundle_id_for_provison "$PROVISION"`
+    add_provision_for_bundle_id "$PROVISION" "$BUNDLE_ID"
 }
 
 # Load bundle identifiers from provisioning profiles
@@ -269,206 +271,225 @@ done
 # Resign the given application
 function resign {
 
-local APP_PATH="$1"
-local NESTED="$2"
-local BUNDLE_IDENTIFIER="$BUNDLE_IDENTIFIER"
-local NEW_PROVISION="$NEW_PROVISION"
-local APP_IDENTIFER_PREFIX=""
-local TEAM_IDENTIFIER=""
+    local APP_PATH="$1"
+    local NESTED="$2"
+    local BUNDLE_IDENTIFIER="$BUNDLE_IDENTIFIER"
+    local NEW_PROVISION="$NEW_PROVISION"
+    local APP_IDENTIFER_PREFIX=""
+    local TEAM_IDENTIFIER=""
 
-if [[ "$NESTED" == NESTED ]]; then
-    # Ignore bundle identifier for nested applications
-    BUNDLE_IDENTIFIER=""
-fi
+    if [[ "$NESTED" == NESTED ]]; then
+        # Ignore bundle identifier for nested applications
+        BUNDLE_IDENTIFIER=""
+    fi
 
-# Make sure that the Info.plist file is where we expect it
-if [ ! -e "$APP_PATH/Info.plist" ];
-then
-    echo "Expected file does not exist: '$APP_PATH/Info.plist'" >&2
-    exit 1;
-fi
+    # Make sure that the Info.plist file is where we expect it
+    if [ ! -e "$APP_PATH/Info.plist" ];
+    then
+        echo "Expected file does not exist: '$APP_PATH/Info.plist'" >&2
+        exit 1;
+    fi
 
-# Read in current values from the app
-local CURRENT_NAME=`PlistBuddy -c "Print :CFBundleDisplayName" "$APP_PATH/Info.plist"`
-local CURRENT_BUNDLE_IDENTIFIER=`PlistBuddy -c "Print :CFBundleIdentifier" "$APP_PATH/Info.plist"`
-local NEW_PROVISION=`provision_for_bundle_id "${BUNDLE_IDENTIFIER:-$CURRENT_BUNDLE_IDENTIFIER}"`
+    # Read in current values from the app
+    local CURRENT_NAME=`PlistBuddy -c "Print :CFBundleDisplayName" "$APP_PATH/Info.plist"`
+    local CURRENT_BUNDLE_IDENTIFIER=`PlistBuddy -c "Print :CFBundleIdentifier" "$APP_PATH/Info.plist"`
+    local NEW_PROVISION=`provision_for_bundle_id "${BUNDLE_IDENTIFIER:-$CURRENT_BUNDLE_IDENTIFIER}"`
 
-if [[ "$NEW_PROVISION" == "" && "$NESTED" != NESTED ]]; then
-    NEW_PROVISION="$DEFAULT_PROVISION"
-fi
+    if [[ "$NEW_PROVISION" == "" && "$NESTED" != NESTED ]]; then
+        NEW_PROVISION="$DEFAULT_PROVISION"
+    fi
 
-if [[ "$NEW_PROVISION" == "" ]]; then
-    if [[ "$NESTED" == NESTED ]]; then
-        echo "No provisioning profile for nested application: '$APP_PATH' with bundle identifier '${BUNDLE_IDENTIFIER:-$CURRENT_BUNDLE_IDENTIFIER}'" >&2
-    else
-        echo "No provisioning profile for application: '$APP_PATH' with bundle identifier '${BUNDLE_IDENTIFIER:-$CURRENT_BUNDLE_IDENTIFIER}'" >&2
+    if [[ "$NEW_PROVISION" == "" ]]; then
+        if [[ "$NESTED" == NESTED ]]; then
+            echo "No provisioning profile for nested application: '$APP_PATH' with bundle identifier '${BUNDLE_IDENTIFIER:-$CURRENT_BUNDLE_IDENTIFIER}'" >&2
+        else
+            echo "No provisioning profile for application: '$APP_PATH' with bundle identifier '${BUNDLE_IDENTIFIER:-$CURRENT_BUNDLE_IDENTIFIER}'" >&2
+        fi
+        echo "Use the -p option (example: -p com.example.app=xxxx.mobileprovision)" >&2
+        exit 1;
     fi
-    echo "Use the -p option (example: -p com.example.app=xxxx.mobileprovision)" >&2
-    exit 1;
-fi
 
-local PROVISION_BUNDLE_IDENTIFIER=`bundle_id_for_provison "$NEW_PROVISION"`
+    local PROVISION_BUNDLE_IDENTIFIER=`bundle_id_for_provison "$NEW_PROVISION"`
 
-# Use provisioning profile's bundle identifier
-if [ "$BUNDLE_IDENTIFIER" == "" ]; then
-    if [[ "$PROVISION_BUNDLE_IDENTIFIER" =~ \* ]]; then
-        echo "Bundle Identifier contains a *, using the current bundle identifier" >&2
-        BUNDLE_IDENTIFIER="$CURRENT_BUNDLE_IDENTIFIER"
-    else
-        BUNDLE_IDENTIFIER="$PROVISION_BUNDLE_IDENTIFIER"
+    # Use provisioning profile's bundle identifier
+    if [ "$BUNDLE_IDENTIFIER" == "" ]; then
+        if [[ "$PROVISION_BUNDLE_IDENTIFIER" =~ \* ]]; then
+            echo "Bundle Identifier contains a *, using the current bundle identifier" >&2
+            BUNDLE_IDENTIFIER="$CURRENT_BUNDLE_IDENTIFIER"
+        else
+            BUNDLE_IDENTIFIER="$PROVISION_BUNDLE_IDENTIFIER"
+        fi
     fi
-fi
 
-if ! does_bundle_id_match "$PROVISION_BUNDLE_IDENTIFIER" "$BUNDLE_IDENTIFIER"; then
-    echo "Bundle Identifier '$PROVISION_BUNDLE_IDENTIFIER' in provisioning profile '$NEW_PROVISION' does not match the Bundle Identifier '$BUNDLE_IDENTIFIER' for application '$APP_PATH'." >&2
-    exit 1
-fi
+    if ! does_bundle_id_match "$PROVISION_BUNDLE_IDENTIFIER" "$BUNDLE_IDENTIFIER"; then
+        echo "Bundle Identifier '$PROVISION_BUNDLE_IDENTIFIER' in provisioning profile '$NEW_PROVISION' does not match the Bundle Identifier '$BUNDLE_IDENTIFIER' for application '$APP_PATH'." >&2
+        exit 1
+    fi
 
-echo "Current bundle identifier is: '$CURRENT_BUNDLE_IDENTIFIER'" >&2
-echo "New bundle identifier will be: '$BUNDLE_IDENTIFIER'" >&2
+    echo "Current bundle identifier is: '$CURRENT_BUNDLE_IDENTIFIER'" >&2
+    echo "New bundle identifier will be: '$BUNDLE_IDENTIFIER'" >&2
 
-# Update the CFBundleDisplayName property in the Info.plist if a new name has been provided
-if [ "${DISPLAY_NAME}" != "" ];
-then
-    if [ "${DISPLAY_NAME}" != "${CURRENT_NAME}" ];
+    # Update the CFBundleDisplayName property in the Info.plist if a new name has been provided
+    if [ "${DISPLAY_NAME}" != "" ];
     then
-        echo "Changing display name from '$CURRENT_NAME' to '$DISPLAY_NAME'" >&2
-        `PlistBuddy -c "Set :CFBundleDisplayName $DISPLAY_NAME" "$APP_PATH/Info.plist"`
+        if [ "${DISPLAY_NAME}" != "${CURRENT_NAME}" ];
+        then
+            echo "Changing display name from '$CURRENT_NAME' to '$DISPLAY_NAME'" >&2
+            `PlistBuddy -c "Set :CFBundleDisplayName $DISPLAY_NAME" "$APP_PATH/Info.plist"`
+        fi
     fi
-fi
 
-# Replace the embedded mobile provisioning profile
-echo "Validating the new provisioning profile: $NEW_PROVISION" >&2
-security cms -D -i "$NEW_PROVISION" > "$TEMP_DIR/profile.plist"
-checkStatus
+    # Replace the embedded mobile provisioning profile
+    echo "Validating the new provisioning profile: $NEW_PROVISION" >&2
+    security cms -D -i "$NEW_PROVISION" > "$TEMP_DIR/profile.plist"
+    checkStatus
 
-APP_IDENTIFER_PREFIX=`PlistBuddy -c "Print :Entitlements:application-identifier" "$TEMP_DIR/profile.plist" | grep -E '^[A-Z0-9]*' -o | tr -d '\n'` 
-if [ "$APP_IDENTIFER_PREFIX" == "" ];
-then
-    APP_IDENTIFER_PREFIX=`PlistBuddy -c "Print :ApplicationIdentifierPrefix:0" "$TEMP_DIR/profile.plist"` 
+    APP_IDENTIFER_PREFIX=`PlistBuddy -c "Print :Entitlements:application-identifier" "$TEMP_DIR/profile.plist" | grep -E '^[A-Z0-9]*' -o | tr -d '\n'`
     if [ "$APP_IDENTIFER_PREFIX" == "" ];
     then
-        echo "Failed to extract any app identifier prefix from '$NEW_PROVISION'" >&2
-        exit 1;
+        APP_IDENTIFER_PREFIX=`PlistBuddy -c "Print :ApplicationIdentifierPrefix:0" "$TEMP_DIR/profile.plist"`
+        if [ "$APP_IDENTIFER_PREFIX" == "" ];
+        then
+            echo "Failed to extract any app identifier prefix from '$NEW_PROVISION'" >&2
+            exit 1;
+        else
+            echo "WARNING: extracted an app identifier prefix '$APP_IDENTIFER_PREFIX' from '$NEW_PROVISION', but it was not found in the profile's entitlements" >&2
+        fi
     else
-        echo "WARNING: extracted an app identifier prefix '$APP_IDENTIFER_PREFIX' from '$NEW_PROVISION', but it was not found in the profile's entitlements" >&2
+        echo "Profile app identifier prefix is '$APP_IDENTIFER_PREFIX'" >&2
     fi
-else
-    echo "Profile app identifier prefix is '$APP_IDENTIFER_PREFIX'" >&2
-fi
 
-TEAM_IDENTIFIER=`PlistBuddy -c "Print :Entitlements:com.apple.developer.team-identifier" "$TEMP_DIR/profile.plist" | tr -d '\n'` 
-if [ "$TEAM_IDENTIFIER" == "" ];
-then
-    TEAM_IDENTIFIER=`PlistBuddy -c "Print :TeamIdentifier:0" "$TEMP_DIR/profile.plist"` 
+    TEAM_IDENTIFIER=`PlistBuddy -c "Print :Entitlements:com.apple.developer.team-identifier" "$TEMP_DIR/profile.plist" | tr -d '\n'`
     if [ "$TEAM_IDENTIFIER" == "" ];
     then
-        echo "Failed to extract team identifier from '$NEW_PROVISION', resigned ipa may fail on iOS 8 and higher" >&2
+        TEAM_IDENTIFIER=`PlistBuddy -c "Print :TeamIdentifier:0" "$TEMP_DIR/profile.plist"`
+        if [ "$TEAM_IDENTIFIER" == "" ];
+        then
+            echo "Failed to extract team identifier from '$NEW_PROVISION', resigned ipa may fail on iOS 8 and higher" >&2
+        else
+            echo "WARNING: extracted a team identifier '$TEAM_IDENTIFIER' from '$NEW_PROVISION', but it was not found in the profile's entitlements, resigned ipa may fail on iOS 8 and higher" >&2
+        fi
     else
-        echo "WARNING: extracted a team identifier '$TEAM_IDENTIFIER' from '$NEW_PROVISION', but it was not found in the profile's entitlements, resigned ipa may fail on iOS 8 and higher" >&2
+        echo "Profile team identifier is '$TEAM_IDENTIFIER'" >&2
     fi
-else
-    echo "Profile team identifier is '$TEAM_IDENTIFIER'" >&2
-fi
 
-cp "$NEW_PROVISION" "$APP_PATH/embedded.mobileprovision"
+    cp "$NEW_PROVISION" "$APP_PATH/embedded.mobileprovision"
 
 
-#if the current bundle identifier is different from the new one in the provisioning profile, then change it.
-if [ "$CURRENT_BUNDLE_IDENTIFIER" != "$BUNDLE_IDENTIFIER" ];
-then
-    echo "Updating the bundle identifier from '$CURRENT_BUNDLE_IDENTIFIER' to '$BUNDLE_IDENTIFIER'" >&2
-    `PlistBuddy -c "Set :CFBundleIdentifier $BUNDLE_IDENTIFIER" "$APP_PATH/Info.plist"`
-    checkStatus
-fi
-
-# Update the version number properties in the Info.plist if a version number has been provided
-if [ "$VERSION_NUMBER" != "" ];
-then
-    CURRENT_VERSION_NUMBER=`PlistBuddy -c "Print :CFBundleVersion" "$APP_PATH/Info.plist"`
-    if [ "$VERSION_NUMBER" != "$CURRENT_VERSION_NUMBER" ];
+    #if the current bundle identifier is different from the new one in the provisioning profile, then change it.
+    if [ "$CURRENT_BUNDLE_IDENTIFIER" != "$BUNDLE_IDENTIFIER" ];
     then
-        echo "Updating the version from '$CURRENT_VERSION_NUMBER' to '$VERSION_NUMBER'" >&2
-        `PlistBuddy -c "Set :CFBundleVersion $VERSION_NUMBER" "$APP_PATH/Info.plist"`
-        `PlistBuddy -c "Set :CFBundleShortVersionString $VERSION_NUMBER" "$APP_PATH/Info.plist"`
+        echo "Updating the bundle identifier from '$CURRENT_BUNDLE_IDENTIFIER' to '$BUNDLE_IDENTIFIER'" >&2
+        `PlistBuddy -c "Set :CFBundleIdentifier $BUNDLE_IDENTIFIER" "$APP_PATH/Info.plist"`
+        checkStatus
     fi
-fi
 
-# Check for and resign any embedded frameworks (new feature for iOS 8 and above apps)
-FRAMEWORKS_DIR="$APP_PATH/Frameworks"
-if [ -d "$FRAMEWORKS_DIR" ];
-then
-    if [ "$TEAM_IDENTIFIER" == "" ];
+    # Update the version number properties in the Info.plist if a version number has been provided
+    if [ "$VERSION_NUMBER" != "" ];
     then
-        echo "ERROR: embedded frameworks detected, re-signing iOS 8 (or higher) applications wihout a team identifier in the certificate/profile does not work" >&2
-        exit 1;
-    fi
-    
-    echo "Resigning embedded frameworks using certificate: '$CERTIFICATE'" >&2
-    for framework in "$FRAMEWORKS_DIR"/*
-    do
-        if [[ "$framework" == *.framework || "$framework" == *.dylib ]]
+        CURRENT_VERSION_NUMBER=`PlistBuddy -c "Print :CFBundleVersion" "$APP_PATH/Info.plist"`
+        if [ "$VERSION_NUMBER" != "$CURRENT_VERSION_NUMBER" ];
         then
-            /usr/bin/codesign -f -s "$CERTIFICATE" "$framework"
-            checkStatus
-        else
-            echo "Ignoring non-framework: $framework" >&2
+            echo "Updating the version from '$CURRENT_VERSION_NUMBER' to '$VERSION_NUMBER'" >&2
+            `PlistBuddy -c "Set :CFBundleVersion $VERSION_NUMBER" "$APP_PATH/Info.plist"`
+            `PlistBuddy -c "Set :CFBundleShortVersionString $VERSION_NUMBER" "$APP_PATH/Info.plist"`
         fi
-    done
-fi
-
+    fi
 
-if [ "$ENTITLEMENTS" != "" ];
-then
-    if [ -n "$APP_IDENTIFER_PREFIX" ];
+    # Check for and resign any embedded frameworks (new feature for iOS 8 and above apps)
+    FRAMEWORKS_DIR="$APP_PATH/Frameworks"
+    if [ -d "$FRAMEWORKS_DIR" ];
     then
-        # sanity check the 'application-identifier' is present in the provided entitlements and matches the provisioning profile value 
-        ENTITLEMENTS_APP_ID_PREFIX=`PlistBuddy -c "Print :application-identifier" "$ENTITLEMENTS" | grep -E '^[A-Z0-9]*' -o | tr -d '\n'` 
-        if [ "$ENTITLEMENTS_APP_ID_PREFIX" == "" ]; 
-        then
-            echo "Provided entitlements file is missing a value for the required 'application-identifier' key" >&2
-            exit 1;
-        elif [ "$ENTITLEMENTS_APP_ID_PREFIX" != "$APP_IDENTIFER_PREFIX" ]; 
+        if [ "$TEAM_IDENTIFIER" == "" ];
         then
-            echo "Provided entitlements file's app identifier prefix value '$ENTITLEMENTS_APP_ID_PREFIX' does not match the provided provisioning profile's value '$APP_IDENTIFER_PREFIX'" >&2
+            echo "ERROR: embedded frameworks detected, re-signing iOS 8 (or higher) applications wihout a team identifier in the certificate/profile does not work" >&2
             exit 1;
         fi
+
+        echo "Resigning embedded frameworks using certificate: '$CERTIFICATE'" >&2
+        for framework in "$FRAMEWORKS_DIR"/*
+        do
+            if [[ "$framework" == *.framework || "$framework" == *.dylib ]]
+            then
+                /usr/bin/codesign -f -s "$CERTIFICATE" "$framework"
+                checkStatus
+            else
+                echo "Ignoring non-framework: $framework" >&2
+            fi
+        done
     fi
 
-    if [ -n "$TEAM_IDENTIFIER" ];
+    # Check for and update bundle identifiers for extensions and associated nested apps
+    echo "Fixing nested app and extension references"
+    for key in ${NESTED_APP_REFERENCE_KEYS[@]}; do
+        # Check if Info.plist has a reference to another app or extension
+        REF_BUNDLE_ID=`PlistBuddy -c "Print ${key}" "$APP_PATH/Info.plist" 2>/dev/null`
+        if [ -n "$REF_BUNDLE_ID" ];
+        then
+            # Found a reference bundle id, now get the corresponding provisioning profile for this bundle id
+            REF_PROVISION=`provision_for_bundle_id $REF_BUNDLE_ID`
+            # Map to the new bundle id
+            NEW_REF_BUNDLE_ID=`bundle_id_for_provison "$REF_PROVISION"`
+            # Change if not the same
+            if [ "$REF_BUNDLE_ID" != "$NEW_REF_BUNDLE_ID" ];
+            then
+                echo "Updating nested app or extension reference for ${key} key from ${REF_BUNDLE_ID} to ${NEW_REF_BUNDLE_ID}" >&2
+                `PlistBuddy -c "Set ${key} $NEW_REF_BUNDLE_ID" "$APP_PATH/Info.plist"`
+            fi
+        fi
+    done
+
+    if [ "$ENTITLEMENTS" != "" ];
     then
-        # sanity check the 'com.apple.developer.team-identifier' is present in the provided entitlements and matches the provisioning profile value
-        ENTITLEMENTS_TEAM_IDENTIFIER=`PlistBuddy -c "Print :com.apple.developer.team-identifier" "$ENTITLEMENTS" | tr -d '\n'` 
-        if [ "$ENTITLEMENTS_TEAM_IDENTIFIER" == "" ]; 
+        if [ -n "$APP_IDENTIFER_PREFIX" ];
         then
-            echo "Provided entitlements file is missing a value for the required 'com.apple.developer.team-identifier' key" >&2
-            exit 1;
-        elif [ "$ENTITLEMENTS_TEAM_IDENTIFIER" != "$TEAM_IDENTIFIER" ]; 
+            # sanity check the 'application-identifier' is present in the provided entitlements and matches the provisioning profile value
+            ENTITLEMENTS_APP_ID_PREFIX=`PlistBuddy -c "Print :application-identifier" "$ENTITLEMENTS" | grep -E '^[A-Z0-9]*' -o | tr -d '\n'`
+            if [ "$ENTITLEMENTS_APP_ID_PREFIX" == "" ];
+            then
+                echo "Provided entitlements file is missing a value for the required 'application-identifier' key" >&2
+                exit 1;
+            elif [ "$ENTITLEMENTS_APP_ID_PREFIX" != "$APP_IDENTIFER_PREFIX" ];
+            then
+                echo "Provided entitlements file's app identifier prefix value '$ENTITLEMENTS_APP_ID_PREFIX' does not match the provided provisioning profile's value '$APP_IDENTIFER_PREFIX'" >&2
+                exit 1;
+            fi
+        fi
+
+        if [ -n "$TEAM_IDENTIFIER" ];
         then
-            echo "Provided entitlements file's 'com.apple.developer.team-identifier' '$ENTITLEMENTS_TEAM_IDENTIFIER' does not match the provided provisioning profile's value '$TEAM_IDENTIFIER'" >&2
-            exit 1;
+            # sanity check the 'com.apple.developer.team-identifier' is present in the provided entitlements and matches the provisioning profile value
+            ENTITLEMENTS_TEAM_IDENTIFIER=`PlistBuddy -c "Print :com.apple.developer.team-identifier" "$ENTITLEMENTS" | tr -d '\n'`
+            if [ "$ENTITLEMENTS_TEAM_IDENTIFIER" == "" ];
+            then
+                echo "Provided entitlements file is missing a value for the required 'com.apple.developer.team-identifier' key" >&2
+                exit 1;
+            elif [ "$ENTITLEMENTS_TEAM_IDENTIFIER" != "$TEAM_IDENTIFIER" ];
+            then
+                echo "Provided entitlements file's 'com.apple.developer.team-identifier' '$ENTITLEMENTS_TEAM_IDENTIFIER' does not match the provided provisioning profile's value '$TEAM_IDENTIFIER'" >&2
+                exit 1;
+            fi
         fi
-    fi
 
-    echo "Resigning application using certificate: '$CERTIFICATE'" >&2
-    echo "and entitlements: $ENTITLEMENTS" >&2
-    cp -- "$ENTITLEMENTS" "$APP_PATH/archived-expanded-entitlements.xcent"
-    /usr/bin/codesign -f -s "$CERTIFICATE" --entitlements="$ENTITLEMENTS" "$APP_PATH"
-    checkStatus
-else
-    echo "Extracting entitlements from provisioning profile" >&2
-    PlistBuddy -x -c "Print Entitlements" "$TEMP_DIR/profile.plist" > "$TEMP_DIR/newEntitlements"
-    checkStatus
-    echo "Resigning application using certificate: '$CERTIFICATE'" >&2
-    echo "and entitlements from provisioning profile: $NEW_PROVISION" >&2
-    cp -- "$TEMP_DIR/newEntitlements" "$APP_PATH/archived-expanded-entitlements.xcent"
-    /usr/bin/codesign -f -s "$CERTIFICATE" --entitlements="$TEMP_DIR/newEntitlements" "$APP_PATH"
-    checkStatus
-fi
+        echo "Resigning application using certificate: '$CERTIFICATE'" >&2
+        echo "and entitlements: $ENTITLEMENTS" >&2
+        cp -- "$ENTITLEMENTS" "$APP_PATH/archived-expanded-entitlements.xcent"
+        /usr/bin/codesign -f -s "$CERTIFICATE" --entitlements="$ENTITLEMENTS" "$APP_PATH"
+        checkStatus
+    else
+        echo "Extracting entitlements from provisioning profile" >&2
+        PlistBuddy -x -c "Print Entitlements" "$TEMP_DIR/profile.plist" > "$TEMP_DIR/newEntitlements"
+        checkStatus
+        echo "Resigning application using certificate: '$CERTIFICATE'" >&2
+        echo "and entitlements from provisioning profile: $NEW_PROVISION" >&2
+        cp -- "$TEMP_DIR/newEntitlements" "$APP_PATH/archived-expanded-entitlements.xcent"
+        /usr/bin/codesign -f -s "$CERTIFICATE" --entitlements="$TEMP_DIR/newEntitlements" "$APP_PATH"
+        checkStatus
+    fi
 
-# Remove the temporary files if they were created before generating ipa
-rm -f "$TEMP_DIR/newEntitlements"
-rm -f "$TEMP_DIR/profile.plist"
+    # Remove the temporary files if they were created before generating ipa
+    rm -f "$TEMP_DIR/newEntitlements"
+    rm -f "$TEMP_DIR/profile.plist"
 
 }
 
@@ -499,4 +520,4 @@ mv "$TEMP_DIR.ipa" "$NEW_FILE"
 # Remove the temp directory
 rm -rf "$TEMP_DIR"
 
-echo "Process complete" >&2
+echo "Process complete" >&2

data/lib/sigh/resign.rb

@@ -6,16 +6,16 @@ module Sigh
     def run(options, args)
       # get the command line inputs and parse those into the vars we need...
 
-      ipa, signing_identity, provisioning_profiles, entitlements = get_inputs(options, args)
+      ipa, signing_identity, provisioning_profiles, entitlements, version = get_inputs(options, args)
       # ... then invoke our programmatic interface with these vars
-      resign(ipa, signing_identity, provisioning_profiles, entitlements)
+      resign(ipa, signing_identity, provisioning_profiles, entitlements, version)
     end
 
-    def self.resign(ipa, signing_identity, provisioning_profiles, entitlements)
-      self.new.resign(ipa, signing_identity, provisioning_profiles, entitlements)
+    def self.resign(ipa, signing_identity, provisioning_profiles, entitlements, version)
+      self.new.resign(ipa, signing_identity, provisioning_profiles, entitlements, version)
     end
 
-    def resign(ipa, signing_identity, provisioning_profiles, entitlements)
+    def resign(ipa, signing_identity, provisioning_profiles, entitlements, version)
       resign_path = find_resign_path
       signing_identity = find_signing_identity(signing_identity)
 
@@ -27,6 +27,7 @@ module Sigh
       validate_params(resign_path, ipa, provisioning_profiles)
       entitlements = "-e #{entitlements}" if entitlements
       provisioning_options = provisioning_profiles.map { |fst, snd| "-p #{[fst, snd].compact.map(&:shellescape).join('=')}" }.join(' ')
+      version = "-n #{version}" if version
 
       command = [
         resign_path.shellescape,
@@ -34,6 +35,7 @@ module Sigh
         signing_identity.shellescape,
         provisioning_options, # we are aleady shellescaping this above, when we create the provisioning_options from the provisioning_profiles
         entitlements,
+        version,
         ipa.shellescape
       ].join(' ')
 
@@ -54,8 +56,9 @@ module Sigh
       signing_identity = options.signing_identity || ask_for_signing_identity
       provisioning_profiles = options.provisioning_profile || find_provisioning_profile || ask('Path to provisioning file: ')
       entitlements = options.entitlements || find_entitlements
+      version = options.version_number || nil
 
-      return ipa, signing_identity, provisioning_profiles, entitlements
+      return ipa, signing_identity, provisioning_profiles, entitlements, version
     end
 
     def find_resign_path

data/lib/sigh/version.rb

@@ -1,3 +1,3 @@
 module Sigh
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sigh
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -50,14 +50,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: 0.22.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: 0.22.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Because you would rather spend your time building stuff than fighting provisioning