Code clean up 2

Author: lameze

runner/main/jobtypes/performance/performance.sh

@@ -146,39 +146,6 @@ function performance_setup_normal() {
     echo ">>> stopsection <<<"
 }
 
-# Returns (by nameref) an array with the command needed to init the Performance site.
-function performance_initcmd() {
-    local -n cmd=$1
-    # We need to determine the init suite to use.
-    local initsuite=""
-
-
-    # Build the complete init command.
-    cmd=(
-        php admin/cli/install_database.php \
-            --agree-license \
-            --fullname="Moodle Performance Test"\
-            --shortname="moodle" \
-            --adminuser=admin \
-            --adminpass=adminpass
-    )
-}
-
-# Returns (by nameref) an array with the command needed to init the Performance site.
-function performance_perftoolcmd() {
-    local -n cmd=$1
-    # We need to determine the init suite to use.
-    local initsuite=""
-
-    # Build the complete init command.
-    cmd=(
-        php public/local/performancetool/generate_test_data.php \
-            --size="${SITESIZE}" \
-            --planfilespath="/shared" \
-            --quiet="false"
-    )
-}
-
 # Performance job type run.
 function performance_run() {
 
@@ -267,6 +234,33 @@ function performance_teardown() {
     cp -f "${DATADIR}/rundata.json" "${targetpath}"
 }
 
+# Returns the command to install the performance site.
+function performance_initcmd() {
+    local -n cmd=$1
+
+    # Build the complete init command.
+    cmd=(
+        php admin/cli/install_database.php \
+            --agree-license \
+            --fullname="Moodle Performance Test"\
+            --shortname="moodle" \
+            --adminuser=admin \
+            --adminpass=adminpass
+    )
+}
+
+# Returns the command to generate the required test data in the performance site.
+function performance_perftoolcmd() {
+    local -n cmd=$1
+
+    # Build the complete init command.
+    cmd=(
+        php public/local/performancetool/generate_test_data.php \
+            --size="${SITESIZE}" \
+            --planfilespath="/shared" \
+            --quiet="false"
+    )
+}
 
 # Calculate the command to run for Performance main execution,
 # returning it in the passed array parameter.