<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-infrastructure.

</pre>
<p><a href="https://github.com/macports/macports-infrastructure/commit/5daae19ce3489b6d204181b5bfcaf330b3a64c77">https://github.com/macports/macports-infrastructure/commit/5daae19ce3489b6d204181b5bfcaf330b3a64c77</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5daae19ce3489b6d204181b5bfcaf330b3a64c77
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Mar 28 01:31:27 2025 +1100

<span style='display:block; white-space:pre;color:#404040;'>    deploy_archives: consistently quote parameters
</span>---
 buildbot/deploy_archives.sh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/buildbot/deploy_archives.sh b/buildbot/deploy_archives.sh
</span><span style='display:block; white-space:pre;color:#808080;'>index 063dea3..8cad229 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/buildbot/deploy_archives.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/buildbot/deploy_archives.sh
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,23 +53,23 @@ else
</span>     fi
 fi
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if [[ ! -d $ULPATH ]]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    echo $ULPATH does not exist!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if [[ ! -d "$ULPATH" ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    echo "$ULPATH does not exist!"
</span>     rm -f "$LOCKFILE"
     exit 1
 fi
 
 if [[ -n "`ls ${ULPATH}`" ]]; then
     for archive in ${ULPATH}/*/*; do
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        portname=$(basename $(dirname $archive))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        aname=$(basename $archive)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        echo deploying archive: $aname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        portname="$(basename "$(dirname "$archive")")"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        aname="$(basename "$archive")"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        echo "deploying archive: $aname"
</span>         if [[ -n "$PRIVKEY" ]]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            openssl dgst -ripemd160 -sign "${PRIVKEY}" -out ${ULPATH}/${portname}/${aname}.rmd160 ${archive}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            if [[ $? -eq 0 && -f ${ULPATH}/${portname}/${aname}.rmd160 ]]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                chmod a+r ${ULPATH}/${portname}/${aname}.rmd160
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            openssl dgst -ripemd160 -sign "${PRIVKEY}" -out "${ULPATH}/${portname}/${aname}.rmd160" "${archive}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if [[ $? -eq 0 && -f "${ULPATH}/${portname}/${aname}.rmd160" ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                chmod a+r "${ULPATH}/${portname}/${aname}.rmd160"
</span>             else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                rm -rf $ULPATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                rm -rf "$ULPATH"
</span>                 rm -f "$LOCKFILE"
                 exit 1
             fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,16 +77,16 @@ if [[ -n "`ls ${ULPATH}`" ]]; then
</span>     done
 
     if [[ -n "$DLHOST" ]]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        rsync -rlDzv --ignore-existing ${ULPATH}/ ${DLHOST}:${DLPATH}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        rsync -rlDzv --ignore-existing "${ULPATH}/" "${DLHOST}:${DLPATH}"
</span>     else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        rsync -rlDzv --ignore-existing ${ULPATH}/ ${DLPATH}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        rsync -rlDzv --ignore-existing "${ULPATH}/" "${DLPATH}"
</span>     fi
 else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    echo $ULPATH appears to contain no archives
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ls -R $ULPATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    echo "$ULPATH appears to contain no archives"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    ls -R "$ULPATH"
</span> fi
 
 # clean up after ourselves
 rm -f "$LOCKFILE"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-rm -rf $ULPATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rm -rf "$ULPATH"
</span> 
</pre><pre style='margin:0'>

</pre>