More fixes.

diff --git a/testing/scripts/setup_desktop.sh b/testing/scripts/setup_desktop.sh
index 7b90b0f42763eb0918fe499038f79534943f3275..eefe9726da68a6707c6b47523d9f4e9447b45f18 100755 (executable)
--- a/testing/scripts/setup_desktop.sh
+++ b/testing/scripts/setup_desktop.sh
@@ -31,17 +31,17 @@ copy_dirtree() {
     shift 2
     TAGS="$@"
     for TAG in ${TAGS}; do
-       TAG_PATH="${SOURCE_ROOT}/${TAG}"
-       if [ ! -d "${TAG_PATH}" ]; then
+       PATH_TAG="${SOURCE_ROOT}/${TAG}"
+       if [ ! -d "${PATH_TAG}" ]; then
            continue
        fi
-       cd "${TAG_PATH}"
-        for PATH_ in $(find . -type f); do
-            TARGET_PATH="${TARGET_ROOT}"$(echo "${PATH_}" | cut -c2-)
-            SOURCE_PATH=$(realpath "${PATH_}")
-            DIRECTORY=$(dirname "${TARGET_PATH}")
+       cd "${PATH_TAG}"
+        for PATH_REL_SOURCE in $(find . -type f); do
+            PATH_TARGET="${TARGET_ROOT}"$(echo "${PATH_REL_SOURCE}" | cut -c2-)
+            PATH_SOURCE=$(realpath "${PATH_}")
+            DIRECTORY=$(dirname "${PATH_TARGET}")
             mkdir -p "${DIRECTORY}"
-            cp "${SOURCE_PATH}" "${TARGET_PATH}"
+            cp "${PATH_SOURCE}" "${PATH_TARGET}"
         done
         cd -
     done
@@ -127,12 +127,11 @@ install_aptmarkeds() {
     # Walk through the package names in ../aptmark/ files to ensure the respective
     # packages are installed.
     for TAG in $1; do
-        PATH_="${PATH_CONF}/aptmark/${TAG}"
-        if [ ! -f "${PATH_}" ]; then
+        PATH_APTMARK_TAG="${PATH_CONF}/aptmark/${TAG}"
+        if [ ! -f "${PATH_APTMARK_TAG}" ]; then
             continue
         fi
-        cat "${PATH_}" | while read line; do
-            echo "$LINE"
+        cat "${PATH_APTMARK_TAG}" | while read LINE; do
             if [ ! $(echo "${LINE}" | cut -c1) = "#" ]; then
                 apt-get -y -o Dpkg::Options::="--force-confnew" install "${LINE}"
             fi