diff --git a/scripts/analysis/analysis-wrapper.sh b/scripts/analysis/analysis-wrapper.sh
index 1278fd6139..a81aab4b0e 100755
--- a/scripts/analysis/analysis-wrapper.sh
+++ b/scripts/analysis/analysis-wrapper.sh
@@ -15,7 +15,7 @@ ruby scripts/analysis/lint-up.rb $1 $2 $3
 lintValue=$?
 
 curl 2>/dev/null "https://www.kaminsky.me/nc-dev/$repository-findbugs/$stableBranch.xml" -o "/tmp/$stableBranch.xml"
-ruby scripts/analysis/spotbugs-up.rb $3
+ruby scripts/analysis/spotbugs-up.rb "$3"
 spotbugsValue=$?
 
 # exit codes:
@@ -28,7 +28,7 @@ echo "Branch: $3"
 if [ $3 = $stableBranch ]; then
     echo "New spotbugs result for $stableBranch at: https://www.kaminsky.me/nc-dev/$repository-findbugs/$stableBranch.html"
     curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/$repository-findbugs/$stableBranch.html --upload-file app/build/reports/spotbugs/spotbugs.html
-    curl 2>/dev/null -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/$repository-findbugs/$stableBranch.xml --upload-file app/build/reports/spotbugs/gplayDebug.xml
+    curl 2>/dev/null -u "$4:$5" -X PUT "https://nextcloud.kaminsky.me/remote.php/webdav/$repository-findbugs/$stableBranch.xml" --upload-file app/build/reports/spotbugs/gplayDebug.xml
 
     if [ $lintValue -ne 1 ]; then
         echo "New lint result for $stableBranch at: https://www.kaminsky.me/nc-dev/$repository-lint/$stableBranch.html"
@@ -131,7 +131,7 @@ else
     fi
 
     payload="{ \"body\" : \"$codacyResult $lintResult $spotbugsResult $checkLibraryMessage $lintMessage $spotbugsMessage $gplayLimitation $notNull\" }"
-    curl -u $1:$2 -X POST https://api.github.com/repos/nextcloud/android/issues/$7/comments -d "$payload"
+    curl -u "$1:$2" -X POST "https://api.github.com/repos/nextcloud/android/issues/$7/comments" -d "$payload"
 
     if [ ! -z "$gplayLimitation" ]; then
         exit 1
diff --git a/scripts/analysis/spotbugs-up.rb b/scripts/analysis/spotbugs-up.rb
index 80a278b885..e9e960480f 100644
--- a/scripts/analysis/spotbugs-up.rb
+++ b/scripts/analysis/spotbugs-up.rb
@@ -9,16 +9,6 @@ puts "=================== starting Android Spotbugs Entropy Reducer ============
 # get args
 git_branch = ARGV[0]
 
-# ========================  SETUP ============================
-
-# File name and relative path of generated Spotbugs report. Must match build.gradle file:
-#   lintOptions {
-#       htmlOutput file("[FILE_NAME].html")
-#   }
-SPOTBUGS_REPORT_FILE = String.new("app/build/reports/spotbugs/spotbugs.html")
-
-# ================ SETUP DONE; DON'T TOUCH ANYTHING BELOW  ================
-
 require 'fileutils'
 require 'pathname'
 require 'open3'
@@ -27,14 +17,6 @@ require 'open3'
 puts "running Spotbugs..."
 system './gradlew spotbugsGplayDebug 1>/dev/null 2>&1'
 
-# find Spotbugs report file
-spotbugs_reports = Dir.glob(SPOTBUGS_REPORT_FILE)
-if spotbugs_reports.length == 0
-    puts "Spotbugs HTML report not found."
-    exit 1
-end
-spotbugs_report = String.new(spotbugs_reports[0])
-
 # find number of warnings
 current_warning_count = `./scripts/analysis/spotbugsSummary.py --total`.to_i
 puts "found warnings: " + current_warning_count.to_s