tumbler: inline a common sh file used only from one place

Differential Revision: https://phabricator.apertis.org/D532

common/common.sh

@@ -113,20 +113,6 @@ setup_failure() {
     exit 1
 }
 
-########################
-# Conversion Utilities #
-########################
-# Converts bash arrays to "as" GVariant arrays
-bash_arrays_to_gvariant_as() {
-    local i converted="['$1'"
-    shift
-    for i in "$@"; do
-        converted+=", '$i'"
-    done
-    converted+="]"
-    echo "${converted}"
-}
-
 #############
 # Utilities #
 #############

common/thumbnailer-utils.sh

-# Source me!
-# vim: set sts=4 sw=4 et :
-
-_check_uris_have_thumbnail() {
-    local size=$1
-    local uris=$2
-    for i in "${uris[@]}"; do
-        local thumb="${HOME}/.cache/thumbnails/${size}/$(echo -n "${i}" | md5sum | cut -f1 -d\ ).png"
-        say $thumb
-        if [[ ! -f "${thumb}" ]]; then
-            whine "Couldn't find thumbnail $thumb, file $i didn't get thumbnailed!?"
-            ret=1
-        fi
-    done
-}

tumbler/automated/run-test.sh

@@ -5,7 +5,6 @@ set -e
 
 TESTDIR=$(cd $(dirname $0); pwd; cd - &>/dev/null)
 . "${TESTDIR}/config.sh"
-. "${TESTDIR}/../../common/thumbnailer-utils.sh"
 
 #########
 # Setup #
@@ -40,6 +39,29 @@ _kill_monitor_return() {
     return $1
 }
 
+bash_arrays_to_gvariant_as() {
+    local i converted="['$1'"
+    shift
+    for i in "$@"; do
+        converted+=", '$i'"
+    done
+    converted+="]"
+    echo "${converted}"
+}
+
+_check_uris_have_thumbnail() {
+    local size=$1
+    local uris=$2
+    for i in "${uris[@]}"; do
+        local thumb="${HOME}/.cache/thumbnails/${size}/$(echo -n "${i}" | md5sum | cut -f1 -d\ ).png"
+        say $thumb
+        if [[ ! -f "${thumb}" ]]; then
+            whine "Couldn't find thumbnail $thumb, file $i didn't get thumbnailed!?"
+            ret=1
+        fi
+    done
+}
+
 _generate_thumbnails() {
     set -x
     local i ret size files logfile addr obj_path method uris filetypes