Merge branch 'more-symlink-fixes' into 'master'

More symlink fixes

See merge request gitlab-com/migration!175

bin/workflow-script-commons.sh

@@ -44,7 +44,7 @@ function gnu_readlink() {
 
 function ensure_valid() {
   source_vars_file=$(gnu_readlink -f "${SOURCE_VARS_DIR}/source_vars")
-  grep -Eho '(\w+)="__REQUIRED__"' ./bin/source_vars_template.sh |cut -d= -f1 | while read -r i; do
+  grep -Eho '(\w+)="__REQUIRED__"' "${SOURCE_VARS_DIR}/source_vars_template.sh" |cut -d= -f1 | while read -r i; do
     if [[ ${!i:=__REQUIRED__} = "__REQUIRED__" ]]; then
       die "Variable ${i} has not been configured. You may need to update ${source_vars_file}"
     fi
@@ -85,6 +85,10 @@ function ensure_valid() {
   esac
 }
 
+function log_command() {
+  (set -x; "$@")
+}
+
 function header() {
   local full_path
   full_path=$(gnu_readlink -f "${BASH_SOURCE[2]}")