🔨 Fixes various bugs and improvements in automatic sourcemap upload scripts (#375)

Author: alyezz

CHANGELOG.md

@@ -1,3 +1,7 @@
+## master
+
+* Fixes various bugs and improvements in automatic sourcemap upload scripts.
+
 ## v8.6.1 (2019-08-26)
 
 * Introducing our new logo and branding. Meet the new Instabug: the platform for Real-Time Contextual Insights.

README.md

@@ -185,25 +185,9 @@ If your app doesn’t already access the microphone or photo library, we recomme
 
 ## Uploading Source Map Files for Crash Reports
 
-For your app crashes to show up with a fully symbolicated stack trace, we will automatically generate the source map files and upload them to your dashboard on release build. To do so, we rely on your app token being explicitly added to `Instabug.startWithToken('YOUR_APP_TOKEN')` in JavaScript. 
+For your app crashes to show up with a fully symbolicated stack trace, we will automatically generate the source map files and upload them to your dashboard on release build. To do so, we rely on your app token being explicitly added to `Instabug.start('YOUR_APP_TOKEN')` in JavaScript. 
 
-If your app token is defined as a constant or you have different tokens for both iOS and Android apps, set the token as shown below.
-
-1. In Android, go to the `build.gradle` file of the library and you will find below code, replace `YOUR_APP_TOKEN` with your app token from the dashboard.
-
-```java
-task upload_sourcemap(type: Exec) {
-    environment "INSTABUG_APP_TOKEN", "YOUR_APP_TOKEN"
-    commandLine 'sh', './upload_sourcemap.sh'
-}
-```
-
-2. In iOS, go to the build phases of the project, you will find a build phase called `Upload Sourcemap`. Expand it you will find below lines of code, replace `YOUR_APP_TOKEN` with your token from the dashboard.
-
-```bash
-export INSTABUG_APP_TOKEN="YOUR_APP_TOKEN"
-bash "../node_modules/instabug-reactnative/ios/upload_sourcemap.sh"
-```
+If your app token is defined as a constant, you can set an environment variable `INSTABUG_APP_TOKEN` to be used instead.
 
 ## Network Logging
 

android/build.gradle

@@ -45,7 +45,6 @@ task upload_sourcemap(type: Exec) {
         commandLine 'cmd', '/c', 'echo Automatic Upload of sourcemap files is currently not available on windows, please generate the sourcemapfiles and upload them to the dashboard'
         project.logger.lifecycle('Automatic Upload of sourcemap files is currently not available on windows, please generate the sourcemapfiles and upload them to the dashboard')
     } else {
-        environment "INSTABUG_APP_TOKEN", "YOUR_APP_TOKEN"
         commandLine 'sh', './upload_sourcemap.sh'
     }
 }

android/upload_sourcemap.sh

@@ -8,33 +8,27 @@ elif [[ -x "$(command -v brew)" && -s "$(brew --prefix nvm)/nvm.sh" ]]; then
 . "$(brew --prefix nvm)/nvm.sh"
 fi
 export NODE_BINARY=node
-#Generate android sourcemap
-react-native bundle --platform android \
---entry-file index.js \
---dev false \
---bundle-output ./android/main.jsbundle \
---sourcemap-output ./android-sourcemap.json &&
-zip ./android-sourcemap.zip ./android-sourcemap.json
 
-if [ ${INSTABUG_APP_TOKEN} == "YOUR_APP_TOKEN" ]; then
+if [ ! "${INSTABUG_APP_TOKEN}" ] || [ -z "${INSTABUG_APP_TOKEN}" ]; then
     echo "Instabug: Looking for Token..."
-    INSTABUG_APP_TOKEN='';
-    if [ ! "${INSTABUG_APP_TOKEN}" ]; then
-        INSTABUG_APP_TOKEN=$(grep -r --exclude-dir={node_modules,ios,android} 'Instabug.startWithToken(\"[0-9a-zA-Z]*\"' ./ -m 1 | grep -o '\"[0-9a-zA-Z]*\"' | cut -d "\"" -f 2)
-    fi
-
-    if [ ! "${INSTABUG_APP_TOKEN}" ]; then
-        INSTABUG_APP_TOKEN=$(grep -r --exclude-dir={node_modules,ios,android} "Instabug.startWithToken(\'[0-9a-zA-Z]*\'" ./ -m 1 | grep -o "\'[0-9a-zA-Z]*\'" | cut -d "\"" -f 2)
-    fi
+    INSTABUG_APP_TOKEN=$(grep -r --exclude-dir={node_modules,ios,android} "Instabug.start[WithToken]*([\"\'][0-9a-zA-Z]*[\"\']" ./ -m 1 | grep -o "[\"\'][0-9a-zA-Z]*[\"\']" | cut -d "\"" -f 2)
 fi
 
-
-if [ ! "${INSTABUG_APP_TOKEN}" ] || [ -z "${INSTABUG_APP_TOKEN}" ] || [ "${INSTABUG_APP_TOKEN}" == "YOUR_APP_TOKEN" ];then
-    echo "Instabug: err: INSTABUG_APP_TOKEN not found. Make sure you've added the SDK initialization line Instabug.startWithToken Or added it to the environment variable in the gradle"
+if [ ! "${INSTABUG_APP_TOKEN}" ] || [ -z "${INSTABUG_APP_TOKEN}" ]; then
+    echo "Instabug: err: INSTABUG_APP_TOKEN not found. Make sure you've added the SDK initialization line Instabug.start Or added the environment variable INSTABUG_APP_TOKEN"
     exit 0
 else
+    echo "Instabug: Token found" "\""${INSTABUG_APP_TOKEN}"\""
+    echo "Instabug: Generating sourcemap files..."
+    #Generate android sourcemap
+    react-native bundle --platform android \
+    --entry-file index.js \
+    --dev false \
+    --bundle-output ./android/main.jsbundle \
+    --sourcemap-output ./android-sourcemap.json
     echo "Instabug: Uploading files..."
     #Upload android sourcemap
-    curl -X POST 'https://api.instabug.com/api/sdk/v3/symbols_files'  -F "symbols_file=@./android-sourcemap.json"  -F "application_token=${INSTABUG_APP_TOKEN}"  -F "platform=react_native"  -F "os=android" 
+    curl -X POST 'https://api.instabug.com/api/sdk/v3/symbols_files'  -F "symbols_file=@./android-sourcemap.json"  -F "application_token=${INSTABUG_APP_TOKEN}"  -F "platform=react_native"  -F "os=android"
+    rm -rf android-sourcemap.json
     echo 
-fi
+fi

autolink.rb

@@ -28,7 +28,6 @@
 INSTABUG_UPLOAD_NAME = "Upload Sourcemap"
 
 INSTABUG_UPLOAD_SCRIPT = <<-SCRIPTEND
-export INSTABUG_APP_TOKEN="YOUR_APP_TOKEN"
 bash "../node_modules/instabug-reactnative/ios/upload_sourcemap.sh"
 SCRIPTEND
 

ios/upload_sourcemap.sh

@@ -1,39 +1,35 @@
- #!/bin/bash
-cd  "${SRCROOT}"
+#!/bin/sh
+cd ..
+cd ..
 cd ..
 if [[ -s "$HOME/.nvm/nvm.sh" ]]; then
 . "$HOME/.nvm/nvm.sh"
 elif [[ -x "$(command -v brew)" && -s "$(brew --prefix nvm)/nvm.sh" ]]; then
 . "$(brew --prefix nvm)/nvm.sh"
 fi
 export NODE_BINARY=node
-#Generate ios sourcemap
-react-native bundle --platform ios \
---entry-file index.js \
---dev false \
---bundle-output ./ios/main.jsbundle \
---sourcemap-output ./ios-sourcemap.json &&
-zip ./ios-sourcemap.zip ./ios-sourcemap.json
 
-if [ ${INSTABUG_APP_TOKEN} == "YOUR_APP_TOKEN" ]; then
+if [ ! "${INSTABUG_APP_TOKEN}" ] || [ -z "${INSTABUG_APP_TOKEN}" ]; then
     echo "Instabug: Looking for Token..."
-    INSTABUG_APP_TOKEN='';
-    if [ ! "${INSTABUG_APP_TOKEN}" ]; then
-        INSTABUG_APP_TOKEN=$(grep -r --exclude-dir={node_modules,ios,android} 'Instabug.startWithToken(\"[0-9a-zA-Z]*\"' ./ -m 1 | grep -o '\"[0-9a-zA-Z]*\"' | cut -d "\"" -f 2)
-    fi
-
-    if [ ! "${INSTABUG_APP_TOKEN}" ]; then
-        INSTABUG_APP_TOKEN=$(grep -r --exclude-dir={node_modules,ios,android} "Instabug.startWithToken(\'[0-9a-zA-Z]*\'" ./ -m 1 | grep -o "\'[0-9a-zA-Z]*\'" | cut -d "\"" -f 2)
-    fi
+    INSTABUG_APP_TOKEN=$(grep -r --exclude-dir={node_modules,ios,android} "Instabug.start[WithToken]*([\"\'][0-9a-zA-Z]*[\"\']" ./ -m 1 | grep -o "[\"\'][0-9a-zA-Z]*[\"\']" | cut -d "\"" -f 2)
 fi
 
-
-if [ ! "${INSTABUG_APP_TOKEN}" ] || [ -z "${INSTABUG_APP_TOKEN}" ] || [ "${INSTABUG_APP_TOKEN}" == "YOUR_APP_TOKEN" ];then
-    echo "Instabug: err: INSTABUG_APP_TOKEN not found. Make sure you've added the SDK initialization line Instabug.startWithToken Or added it to the environment variable in the gradle"
+if [ ! "${INSTABUG_APP_TOKEN}" ] || [ -z "${INSTABUG_APP_TOKEN}" ]; then
+    echo "Instabug: err: INSTABUG_APP_TOKEN not found. Make sure you've added the SDK initialization line Instabug.start Or added the environment variable INSTABUG_APP_TOKEN"
     exit 0
 else
+    echo "Instabug: Token found" "\""${INSTABUG_APP_TOKEN}"\""
+    echo "Instabug: Generating sourcemap files..."
+    #Generate ios sourcemap
+    react-native bundle --platform ios \
+    --entry-file index.js \
+    --dev false \
+    --bundle-output ./ios/main.jsbundle \
+    --sourcemap-output ./ios-sourcemap.json
     echo "Instabug: Uploading files..."
     #Upload ios sourcemap
     curl -X POST 'https://api.instabug.com/api/sdk/v3/symbols_files'  -F "symbols_file=@./ios-sourcemap.json"  -F "application_token=${INSTABUG_APP_TOKEN}"  -F "platform=react_native"  -F "os=ios" 
+    rm -rf ios-sourcemap.json
     echo 
 fi
+

link.rb

@@ -24,7 +24,6 @@
 INSTABUG_UPLOAD_NAME = "Upload Sourcemap"
 
 INSTABUG_UPLOAD_SCRIPT = <<-SCRIPTEND
-export INSTABUG_APP_TOKEN="YOUR_APP_TOKEN"
 bash "../node_modules/instabug-reactnative/ios/upload_sourcemap.sh"
 SCRIPTEND